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.67 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.84 by root, Sun Oct 1 18:17:38 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::;
11 13
12my $magicmap_tex = 14my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15 17
16sub new { 18sub new {
17 my $class = shift; 19 my $class = shift;
18 20
… …
28 ], 30 ],
29 31
30 @_ 32 @_
31 ); 33 );
32 34
33 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
34 command => $self->{command}, 36 command => $self->{command},
35 can_focus => 1, 37 tooltip => "#completer_help",
36 tooltip => "<b>The Command Completer</b>\n\n"
37 . "This is your central interface to send text commands to the server. "
38 . "To enter a verbatim command to send to the server, just type the command, "
39 . "followed by a space, and press return. "
40 . "Typing the initial letters of words (or just any letters) displays guesses "
41 . "for commands you might want to use.\n"
42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44 ; 38 ;
45 39
46 $self 40 $self
47} 41}
48 42
… …
60 54
61sub clr_commands { 55sub clr_commands {
62 my ($self) = @_; 56 my ($self) = @_;
63 57
64 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
59
60 $self->{completer}->hide
61 if $self->{completer};
62}
63
64sub test_server_login {
65 return unless
66 $::CONN && length $::CONN->{test_server};
67
68 my $server = $::CONN->{test_server};
69 ::stop_game ();
70 local $::PROFILE->{host} = $server;
71 ::start_game ();
72}
73
74sub editor_invoke {
75 return unless $::CONN;
76
77 # putting the password into the env is somewhat tasteless
78 local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
79 local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
80 local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
81 local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root};
82
83 CFPlus::set_proxy;
84
85 my $map = "map:$::CONN->{map_info}[0]";
86
87 if (fork == 0) {
88 $SIG{__DIE__} = sub {
89 warn "@_";
90 CFPlus::_exit 99;
91 };
92
93 # TODO: move into editor
94 require LWP::UserAgent;
95
96 my $ua = LWP::UserAgent->new (
97 agent => "cfplus $CFPlus::VERSION",
98 keep_alive => 1,
99 env_proxy => 1,
100 );
101
102 if ($map =~ /^map:(.*)/) {
103 my $mapname = $1;
104 # try to get the most recent head revision, what a hack
105 my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content;
106
107 if ($log =~ /\?rev=(\d+\.\d+)"/) {
108 my $rev = $1;
109 my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content;
110 warn "revision is $rev " .(length $map)."\n";#d#
111
112 # now upload it
113 my $comment = "some comment";
114
115 require HTTP::Request::Common;
116
117 my $res = $ua->post (
118 $ENV{CFPLUS_UPLOAD},
119 Content_Type => 'multipart/form-data',
120 Content => [
121 path => $mapname,
122 mapdir => $ENV{CROSSFIRE_MAPDIR},
123 map => $map,
124 revision => $rev,
125 cf_login => $ENV{CFPLUS_LOGIN},
126 cf_password => $ENV{CFPLUS_PASSWORD},
127 comment => "",
128 ]
129 );
130
131 if ($res->is_error) {
132 # fatal condition
133 warn $res->status_line;
134 } else {
135 # script replies are marked as {{..}}
136 my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
137 warn map "$_\n", @msgs;
138 }
139 } else {
140 # error, could not detect revision
141 }
142 }
143
144 CFPlus::_exit;
145 }
65} 146}
66 147
67sub invoke_button_down { 148sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 149 my ($self, $ev, $x, $y) = @_;
69 150
70 return unless $::CONN;
71
72 $self->grab_focus;
73
74 if ($ev->{button} == 1) { 151 if ($ev->{button} == 1) {
152 $self->grab_focus;
153 return unless $::CONN;
154
75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 155 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
76 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 156 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
77 157
78 $x -= int 0.5 * $self->{sw}; 158 $x -= int 0.5 * $self->{sw};
79 $y -= int 0.5 * $self->{sh}; 159 $y -= int 0.5 * $self->{sh};
80 160
81 $::CONN->lookat ($x, $y) 161 $::CONN->lookat ($x, $y)
82 if $::CONN; 162 if $::CONN;
83 163
84 } elsif ($ev->{button} == 2) { 164 } elsif ($ev->{button} == 2) {
165 $self->grab_focus;
166 return unless $::CONN;
167
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 169 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 170
88 $self->{motion} = sub { 171 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 172 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 176 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 177 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 178
96 $self->update; 179 $self->update;
97 }; 180 };
181 } elsif ($ev->{button} == 3) {
182 (new CFPlus::UI::Menu
183 items => [
184 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
189 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
190 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
191 [
192 $::PICKUP_ENABLE->{state}
193 ? "Disable automatic pickup"
194 : "Enable automatic pickup",
195 sub { $::PICKUP_ENABLE->toggle }
196 ],
197 $::CONN && length $::CONN->{cvs_root}
198 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
199 \&editor_invoke]
200 : (),
201 $::CONN && length $::CONN->{test_server}
202 ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>",
203 \&test_server_login]
204 : (),
205 ["Quit",
206 sub {
207 if ($::CONN) {
208 &::open_quit_dialog;
209 } else {
210 exit;
211 }
212 }
213 ],
214 ],
215 )->popup ($ev);
98 } 216 }
99 217
100 1 218 1
101} 219}
102 220
… …
120 1 238 1
121} 239}
122 240
123sub size_request { 241sub size_request {
124 ( 242 (
125 32 * CFClient::ceil $::WIDTH / 32, 243 32 * CFPlus::ceil $::WIDTH / 32,
126 32 * CFClient::ceil $::HEIGHT / 32, 244 32 * CFPlus::ceil $::HEIGHT / 32,
127 ) 245 )
128} 246}
129 247
130sub update { 248sub update {
131 my ($self) = @_; 249 my ($self) = @_;
… …
133 $self->{need_update} = 1; 251 $self->{need_update} = 1;
134 $self->SUPER::update; 252 $self->SUPER::update;
135} 253}
136 254
137my %DIR = ( 255my %DIR = (
138 CFClient::SDLK_KP8, [1, "north"], 256 CFPlus::SDLK_KP8, [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 257 CFPlus::SDLK_KP9, [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 258 CFPlus::SDLK_KP6, [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 259 CFPlus::SDLK_KP3, [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 260 CFPlus::SDLK_KP2, [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 261 CFPlus::SDLK_KP1, [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 262 CFPlus::SDLK_KP4, [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 263 CFPlus::SDLK_KP7, [8, "northwest"],
146 264
147 CFClient::SDLK_UP, [1, "north"], 265 CFPlus::SDLK_UP, [1, "north"],
148 CFClient::SDLK_RIGHT, [3, "east"], 266 CFPlus::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 267 CFPlus::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 268 CFPlus::SDLK_LEFT, [7, "west"],
151); 269);
152 270
153sub invoke_key_down { 271sub invoke_key_down {
154 my ($self, $ev) = @_; 272 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 273
158 my $mod = $ev->{mod}; 274 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 275 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 276 my $uni = $ev->{unicode};
161 277
162 if ($sym == CFClient::SDLK_KP5) { 278 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
279
280 if ($uni == ord "\t") {
281 $::PL_WINDOW->toggle_visibility;
282 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
283 $::HELP_WINDOW->toggle_visibility;
284 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
285 ::toggle_player_page ($::STATS_PAGE);
286 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
287 ::toggle_player_page ($::SKILL_PAGE);
288 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
289 ::toggle_player_page ($::SPELL_PAGE);
290 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
291 ::toggle_player_page ($::INVENTORY_PAGE);
292 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
293 $::SETUP_DIALOG->toggle_visibility;
294 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
295 $::BIND_EDITOR->set_binding (undef, undef, [],
296 sub {
297 my ($mod, $sym, $cmds) = @_;
298 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
299 });
300 $::BIND_EDITOR->start;
301 $::BIND_EDITOR->show;
302#TODO: elmex, what was this supposed to do? it currently crashes the client.
303# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
304# $::BIND_EDITOR->stop;
305# $::BIND_EDITOR->ask_for_bind_and_commit;
306# $::BIND_EDITOR->hide;
307 } elsif (!$::CONN) {
308 return 0; # bindings further down need a valid connection
309
310 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 311 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 312 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 313 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 314 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 315 $::CONN->user_send ("apply");
316 } elsif ($uni == 13) {
317 $::CONN->user_send ("examine");
168 } elsif ($uni == ord ".") { 318 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 319 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 320 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 321 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
172 $::INV_WINDOW->toggle_visibility; 322 $::CONN->user_send ($_) for @$bind_cmd;
173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 323 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
174 $::CONN->user_send ("rotateshoottype +"); 324 $::CONN->user_send ("rotateshoottype +");
175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 325 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
176 $::CONN->user_send ("rotateshoottype -"); 326 $::CONN->user_send ("rotateshoottype -");
177 } elsif ($uni == ord '"') { 327 } elsif ($uni == ord '"') {
178 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 328 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
179 $self->{completer}->show; 329 $self->{completer}->show;
180 } elsif ($uni == ord "'") { 330 } elsif ($uni == ord "'") {
181 $self->{completer}->set_prefix (""); 331 $self->{completer}->set_prefix ("");
182 $self->{completer}->show; 332 $self->{completer}->show;
183 } elsif (exists $DIR{$sym}) { 333 } elsif (exists $DIR{$sym}) {
184 if ($mod & CFClient::KMOD_SHIFT) { 334 if ($mod & CFPlus::KMOD_SHIFT) {
185 $self->{shft}++; 335 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) { 336 if ($DIR{$sym}[0] != $self->{fire_dir}) {
187 $::CONN->user_send ("fire $DIR{$sym}[0]"); 337 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 } 338 }
189 $self->{fire_dir} = $DIR{$sym}[0]; 339 $self->{fire_dir} = $DIR{$sym}[0];
190 } elsif ($mod & CFClient::KMOD_CTRL) { 340 } elsif ($mod & CFPlus::KMOD_CTRL) {
191 $self->{ctrl}++; 341 $self->{ctrl}++;
192 $::CONN->user_send ("run $DIR{$sym}[0]"); 342 $::CONN->user_send ("run $DIR{$sym}[0]");
193 } else { 343 } else {
194 $::CONN->user_send ("$DIR{$sym}[1]"); 344 $::CONN->user_send ("$DIR{$sym}[1]");
195 } 345 }
196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
197 $::BIND_EDITOR->set_binding (undef, undef, [],
198 sub {
199 my ($mod, $sym, $cmds) = @_;
200 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
201 });
202 $::BIND_EDITOR->start;
203 $::BIND_EDITOR->show;
204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
205 $::BIND_EDITOR->stop;
206 $::BIND_EDITOR->ask_for_bind_and_commit;
207 $::BIND_EDITOR->hide;
208 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
209 $::CONN->user_send ($_) for @$bind_cmd;
210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 346 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
211 $self->{completer}->invoke_key_down ($ev); 347 $self->{completer}->inject_key_down ($ev);
212 $self->{completer}->show; 348 $self->{completer}->show;
213 } else { 349 } else {
214 return 0; 350 return 0;
215 } 351 }
216 352
… …
223 my $res = 0; 359 my $res = 0;
224 my $mod = $ev->{mod}; 360 my $mod = $ev->{mod};
225 my $sym = $ev->{sym}; 361 my $sym = $ev->{sym};
226 362
227 if ($::CFG->{shift_fire_stop}) { 363 if ($::CFG->{shift_fire_stop}) {
228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 364 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
229 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
231 $res = 1; 367 $res = 1;
232 } 368 }
233 } else { 369 } else {
234 if (exists $DIR{$sym} && delete $self->{shft}) { 370 if (exists $DIR{$sym} && delete $self->{shft}) {
235 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
237 $res = 1; 373 $res = 1;
238 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 374 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
239 $::CONN->user_send ("fire_stop"); 375 $::CONN->user_send ("fire_stop");
240 delete $self->{fire_dir}; 376 delete $self->{fire_dir};
241 $res = 1; 377 $res = 1;
242 } 378 }
243 } 379 }
244 380
245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 381 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
246 $::CONN->user_send ("run_stop"); 382 $::CONN->user_send ("run_stop");
247 $res = 1; 383 $res = 1;
248 } 384 }
249 385
250 $res 386 $res
… …
264sub draw { 400sub draw {
265 my ($self) = @_; 401 my ($self) = @_;
266 402
267 return unless $::MAP; 403 return unless $::MAP;
268 404
269 my $focused = $CFClient::UI::FOCUS == $self 405 my $focused = $CFPlus::UI::FOCUS == $self
270 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 406 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
271 407
272 return 408 return
273 unless $focused || !$::FAST; 409 unless $focused || !$::FAST;
274 410
275 if (delete $self->{need_update}) { 411 if (delete $self->{need_update}) {
276 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 412 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
277 413
278 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 414 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
279 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 415 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
280 416
281 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 417 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
282 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 418 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
283 419
284 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 420 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
285 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 421 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
286 422
287 if ($::CFG->{fow_enable}) { 423 if ($::CFG->{fow_enable}) {
288 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 424 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
289 425
290 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 426 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
291 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 427 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
292 glConvolutionFilter2D ( 428 glConvolutionFilter2D (
293 GL_CONVOLUTION_2D, 429 GL_CONVOLUTION_2D,
294 GL_ALPHA, 430 GL_ALPHA,
295 3, 3, 431 3, 3,
… …
297 (pack "f*", @{ $self->{smooth_matrix} }), 433 (pack "f*", @{ $self->{smooth_matrix} }),
298 ); 434 );
299 glEnable GL_CONVOLUTION_2D; 435 glEnable GL_CONVOLUTION_2D;
300 } 436 }
301 437
302 $self->{fow_texture} = new CFClient::Texture 438 $self->{fow_texture} = new CFPlus::Texture
303 w => $w, 439 w => $w,
304 h => $h, 440 h => $h,
305 data => $data, 441 data => $data,
306 internalformat => GL_ALPHA, 442 internalformat => GL_ALPHA,
307 format => GL_ALPHA; 443 format => GL_ALPHA;
… …
369 glDeleteList $self->{list}; 505 glDeleteList $self->{list};
370 506
371 $self->SUPER::DESTROY; 507 $self->SUPER::DESTROY;
372} 508}
373 509
374package CFClient::MapWidget::MapMap; 510package CFPlus::MapWidget::MapMap;
375 511
376our @ISA = CFClient::UI::Base::; 512our @ISA = CFPlus::UI::Base::;
377 513
378use Time::HiRes qw(time); 514use Time::HiRes qw(time);
379use CFClient::OpenGL; 515use CFPlus::OpenGL;
380 516
381sub size_request { 517sub size_request {
382 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 518 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
383} 519}
384 520
… …
420 556
421 if ($self->{texture_atime} < time) { 557 if ($self->{texture_atime} < time) {
422 $self->{texture_atime} = time + 1/3; 558 $self->{texture_atime} = time + 1/3;
423 559
424 $self->{texture} = 560 $self->{texture} =
425 new CFClient::Texture 561 new CFPlus::Texture
426 w => $w, 562 w => $w,
427 h => $h, 563 h => $h,
428 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 564 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
429 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 565 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
430 } 566 }
431 567
432 $self->{texture}->draw_quad (0, 0); 568 $self->{texture}->draw_quad (0, 0);
433 569
434 glDisable GL_TEXTURE_2D; 570 glDisable GL_TEXTURE_2D;
… …
449 glEnd; 585 glEnd;
450 586
451 glDisable GL_BLEND; 587 glDisable GL_BLEND;
452} 588}
453 589
454package CFClient::MapWidget::Command; 590package CFPlus::MapWidget::Command;
455 591
456use strict; 592use strict;
457 593
458use CFClient::OpenGL; 594use CFPlus::OpenGL;
459 595
460our @ISA = CFClient::UI::Frame::; 596our @ISA = CFPlus::UI::Frame::;
461 597
462sub new { 598sub new {
463 my $class = shift; 599 my $class = shift;
464 600
465 my $self = $class->SUPER::new ( 601 my $self = $class->SUPER::new (
466 bg => [0, 0, 0, 0.8], 602 bg => [0, 0, 0, 0.8],
467 @_, 603 @_,
468 ); 604 );
469 605
470 $self->add ($self->{vbox} = new CFClient::UI::VBox); 606 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
471 607
472 $self->{label} = [ 608 $self->{label} = [
473 map 609 map
474 CFClient::UI::Label->new ( 610 CFPlus::UI::Label->new (
475 can_hover => 1, 611 can_hover => 1,
476 can_events => 1, 612 can_events => 1,
477 tooltip_width => 0.33, 613 tooltip_width => 0.33,
478 fontsize => $_, 614 fontsize => $_,
479 ), (0.8) x 16 615 ), (0.8) x 16
480 ]; 616 ];
481 617
482 $self->{entry} = new CFClient::UI::Entry 618 $self->{entry} = new CFPlus::UI::Entry
483 on_changed => sub { 619 on_changed => sub {
484 $self->update_labels; 620 $self->update_labels;
485 0 621 0
486 }, 622 },
487 on_button_down => sub { 623 on_button_down => sub {
488 my ($entry, $ev, $x, $y) = @_; 624 my ($entry, $ev, $x, $y) = @_;
489 625
490 if ($ev->{button} == 3) { 626 if ($ev->{button} == 3) {
491 (new CFClient::UI::Menu 627 (new CFPlus::UI::Menu
492 items => [ 628 items => [
629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
493 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 630 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
494 ], 631 ],
495 )->popup ($ev); 632 )->popup ($ev);
496 return 1; 633 return 1;
497 } 634 }
498 0 635 0
… …
505 if ($ev->{sym} == 13) { 642 if ($ev->{sym} == 13) {
506 if (exists $self->{select}) { 643 if (exists $self->{select}) {
507 $self->{last_command} = $self->{select}; 644 $self->{last_command} = $self->{select};
508 $::CONN->user_send ($self->{select}); 645 $::CONN->user_send ($self->{select});
509 646
510 unshift @{$self->{history}}, $self->{select}; 647 unshift @{$self->{history}}, $self->{entry}->get_text;
511 $self->{hist_ptr} = 0; 648 $self->{hist_ptr} = 0;
512 649
513 $self->hide; 650 $self->hide;
514 } 651 }
515 } elsif ($ev->{sym} == 27) { 652 } elsif ($ev->{sym} == 27) {
516 $self->{hist_ptr} = 0; 653 $self->{hist_ptr} = 0;
517 $self->hide; 654 $self->hide;
518 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 655 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
519 if ($self->{hist_ptr} > 1) { 656 if ($self->{hist_ptr} > 1) {
520 $self->{hist_ptr}--; 657 $self->{hist_ptr}--;
521 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 658 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
522 } elsif ($self->{hist_ptr} > 0) { 659 } elsif ($self->{hist_ptr} > 0) {
523 $self->{hist_ptr}--; 660 $self->{hist_ptr}--;
… …
525 } else { 662 } else {
526 ++$self->{select_offset} 663 ++$self->{select_offset}
527 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 664 if $self->{select_offset} < $#{ $self->{last_match} || [] };
528 } 665 }
529 $self->update_labels; 666 $self->update_labels;
530 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 667 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
531 if ($self->{select_offset}) { 668 if ($self->{select_offset}) {
532 --$self->{select_offset} 669 --$self->{select_offset}
533 } else { 670 } else {
534 unless ($self->{hist_ptr}) { 671 unless ($self->{hist_ptr}) {
535 $self->{hist_saveback} = $self->{entry}->get_text; 672 $self->{hist_saveback} = $self->{entry}->get_text;
… …
580} 717}
581 718
582sub hide { 719sub hide {
583 my ($self) = @_; 720 my ($self) = @_;
584 721
722 $self->{hist_ptr} = 0;
723
585 $self->SUPER::hide; 724 $self->SUPER::hide;
586 $self->{entry}->set_text (""); 725 $self->{entry}->set_text ("");
587} 726}
588 727
589sub invoke_key_down { 728sub inject_key_down {
590 my ($self, $ev) = @_; 729 my ($self, $ev) = @_;
591 730
731 $self->{entry}->grab_focus;
592 $self->{entry}->emit (key_down => $ev) 732 $self->{entry}->emit (key_down => $ev);
593} 733}
594 734
595sub update_labels { 735sub update_labels {
596 my ($self) = @_; 736 my ($self) = @_;
597 737
… …
690 830
691sub _draw { 831sub _draw {
692 my ($self) = @_; 832 my ($self) = @_;
693 833
694 # hack 834 # hack
695 local $CFClient::UI::FOCUS = $self->{entry}; 835 local $CFPlus::UI::FOCUS = $self->{entry};
696 836
697 $self->SUPER::_draw; 837 $self->SUPER::_draw;
698} 838}
699 839
7001 8401

Diff Legend

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