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.74 by root, Sun Jul 16 23:30:08 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 if ($ev->{button} == 1) { 151 if ($ev->{button} == 1) {
71 $self->grab_focus; 152 $self->grab_focus;
72 return unless $::CONN; 153 return unless $::CONN;
73 154
74 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};
75 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};
76 157
77 $x -= int 0.5 * $self->{sw}; 158 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $self->{sh}; 159 $y -= int 0.5 * $self->{sh};
79 160
80 $::CONN->lookat ($x, $y) 161 $::CONN->lookat ($x, $y)
… …
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 177 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 178
98 $self->update; 179 $self->update;
99 }; 180 };
100 } elsif ($ev->{button} == 3) { 181 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu 182 (new CFPlus::UI::Menu
102 items => [ 183 items => [
103 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 184 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 185 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
106 ["Inventory…\tF4", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
107 ["Spells…\tF5", sub { ::toggle_player_page ($::SPELL_PAGE) }],
108 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 189 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
109 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 190 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
110 [ 191 [
111 $::PICKUP_ENABLE->{state} 192 $::PICKUP_ENABLE->{state}
112 ? "Disable automatic pickup" 193 ? "Disable automatic pickup"
113 : "Enable automatic pickup", 194 : "Enable automatic pickup",
114 sub { $::PICKUP_ENABLE->toggle } 195 sub { $::PICKUP_ENABLE->toggle }
115 ], 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 ],
116 ], 214 ],
117 )->popup ($ev); 215 )->popup ($ev);
118 } 216 }
119 217
120 1 218 1
… …
140 1 238 1
141} 239}
142 240
143sub size_request { 241sub size_request {
144 ( 242 (
145 32 * CFClient::ceil $::WIDTH / 32, 243 32 * CFPlus::ceil $::WIDTH / 32,
146 32 * CFClient::ceil $::HEIGHT / 32, 244 32 * CFPlus::ceil $::HEIGHT / 32,
147 ) 245 )
148} 246}
149 247
150sub update { 248sub update {
151 my ($self) = @_; 249 my ($self) = @_;
… …
153 $self->{need_update} = 1; 251 $self->{need_update} = 1;
154 $self->SUPER::update; 252 $self->SUPER::update;
155} 253}
156 254
157my %DIR = ( 255my %DIR = (
158 CFClient::SDLK_KP8, [1, "north"], 256 CFPlus::SDLK_KP8, [1, "north"],
159 CFClient::SDLK_KP9, [2, "northeast"], 257 CFPlus::SDLK_KP9, [2, "northeast"],
160 CFClient::SDLK_KP6, [3, "east"], 258 CFPlus::SDLK_KP6, [3, "east"],
161 CFClient::SDLK_KP3, [4, "southeast"], 259 CFPlus::SDLK_KP3, [4, "southeast"],
162 CFClient::SDLK_KP2, [5, "south"], 260 CFPlus::SDLK_KP2, [5, "south"],
163 CFClient::SDLK_KP1, [6, "southwest"], 261 CFPlus::SDLK_KP1, [6, "southwest"],
164 CFClient::SDLK_KP4, [7, "west"], 262 CFPlus::SDLK_KP4, [7, "west"],
165 CFClient::SDLK_KP7, [8, "northwest"], 263 CFPlus::SDLK_KP7, [8, "northwest"],
166 264
167 CFClient::SDLK_UP, [1, "north"], 265 CFPlus::SDLK_UP, [1, "north"],
168 CFClient::SDLK_RIGHT, [3, "east"], 266 CFPlus::SDLK_RIGHT, [3, "east"],
169 CFClient::SDLK_DOWN, [5, "south"], 267 CFPlus::SDLK_DOWN, [5, "south"],
170 CFClient::SDLK_LEFT, [7, "west"], 268 CFPlus::SDLK_LEFT, [7, "west"],
171); 269);
172 270
173sub invoke_key_down { 271sub invoke_key_down {
174 my ($self, $ev) = @_; 272 my ($self, $ev) = @_;
175 273
176 my $mod = $ev->{mod}; 274 my $mod = $ev->{mod};
177 my $sym = $ev->{sym}; 275 my $sym = $ev->{sym};
178 my $uni = $ev->{unicode}; 276 my $uni = $ev->{unicode};
179 277
180 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 278 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
181 279
182 if ($uni == ord "\t") { 280 if ($uni == ord "\t") {
183 $::PL_WINDOW->toggle_visibility; 281 $::PL_WINDOW->toggle_visibility;
184 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 282 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
185 $::HELP_WINDOW->toggle_visibility; 283 $::HELP_WINDOW->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 284 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
187 ::toggle_player_page ($::STATS_PAGE); 285 ::toggle_player_page ($::STATS_PAGE);
188 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 286 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
189 ::toggle_player_page ($::SKILL_PAGE); 287 ::toggle_player_page ($::SKILL_PAGE);
190 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 288 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
289 ::toggle_player_page ($::SPELL_PAGE);
290 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
191 ::toggle_player_page ($::INVENTORY_PAGE); 291 ::toggle_player_page ($::INVENTORY_PAGE);
192 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
193 ::toggle_player_page ($::SPELL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 292 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
195 $::SETUP_DIALOG->toggle_visibility; 293 $::SETUP_DIALOG->toggle_visibility;
196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 294 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
197 $::BIND_EDITOR->set_binding (undef, undef, [], 295 $::BIND_EDITOR->set_binding (undef, undef, [],
198 sub { 296 sub {
199 my ($mod, $sym, $cmds) = @_; 297 my ($mod, $sym, $cmds) = @_;
200 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); 298 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
201 }); 299 });
202 $::BIND_EDITOR->start; 300 $::BIND_EDITOR->start;
203 $::BIND_EDITOR->show; 301 $::BIND_EDITOR->show;
302#TODO: elmex, what was this supposed to do? it currently crashes the client.
204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 303# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
205 $::BIND_EDITOR->stop; 304# $::BIND_EDITOR->stop;
206 $::BIND_EDITOR->ask_for_bind_and_commit; 305# $::BIND_EDITOR->ask_for_bind_and_commit;
207 $::BIND_EDITOR->hide; 306# $::BIND_EDITOR->hide;
208 } elsif (!$::CONN) { 307 } elsif (!$::CONN) {
209 return 0; # bindings further down need a valid connection 308 return 0; # bindings further down need a valid connection
210 309
211 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 310 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
212 $::CONN->user_send ("stay fire"); 311 $::CONN->user_send ("stay fire");
213 } elsif ($uni == ord ",") { 312 } elsif ($uni == ord ",") {
214 $::CONN->user_send ("take"); 313 $::CONN->user_send ("take");
215 } elsif ($uni == ord " ") { 314 } elsif ($uni == ord " ") {
216 $::CONN->user_send ("apply"); 315 $::CONN->user_send ("apply");
316 } elsif ($uni == 13) {
317 $::CONN->user_send ("examine");
217 } elsif ($uni == ord ".") { 318 } elsif ($uni == ord ".") {
218 $::CONN->user_send ($self->{completer}{last_command}) 319 $::CONN->user_send ($self->{completer}{last_command})
219 if exists $self->{completer}{last_command}; 320 if exists $self->{completer}{last_command};
220 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 321 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
221 $::CONN->user_send ($_) for @$bind_cmd; 322 $::CONN->user_send ($_) for @$bind_cmd;
222 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 323 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
223 $::CONN->user_send ("rotateshoottype +"); 324 $::CONN->user_send ("rotateshoottype +");
224 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 325 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
225 $::CONN->user_send ("rotateshoottype -"); 326 $::CONN->user_send ("rotateshoottype -");
226 } elsif ($uni == ord '"') { 327 } elsif ($uni == ord '"') {
227 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 328 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
228 $self->{completer}->show; 329 $self->{completer}->show;
229 } elsif ($uni == ord "'") { 330 } elsif ($uni == ord "'") {
230 $self->{completer}->set_prefix (""); 331 $self->{completer}->set_prefix ("");
231 $self->{completer}->show; 332 $self->{completer}->show;
232 } elsif (exists $DIR{$sym}) { 333 } elsif (exists $DIR{$sym}) {
233 if ($mod & CFClient::KMOD_SHIFT) { 334 if ($mod & CFPlus::KMOD_SHIFT) {
234 $self->{shft}++; 335 $self->{shft}++;
235 if ($DIR{$sym}[0] != $self->{fire_dir}) { 336 if ($DIR{$sym}[0] != $self->{fire_dir}) {
236 $::CONN->user_send ("fire $DIR{$sym}[0]"); 337 $::CONN->user_send ("fire $DIR{$sym}[0]");
237 } 338 }
238 $self->{fire_dir} = $DIR{$sym}[0]; 339 $self->{fire_dir} = $DIR{$sym}[0];
239 } elsif ($mod & CFClient::KMOD_CTRL) { 340 } elsif ($mod & CFPlus::KMOD_CTRL) {
240 $self->{ctrl}++; 341 $self->{ctrl}++;
241 $::CONN->user_send ("run $DIR{$sym}[0]"); 342 $::CONN->user_send ("run $DIR{$sym}[0]");
242 } else { 343 } else {
243 $::CONN->user_send ("$DIR{$sym}[1]"); 344 $::CONN->user_send ("$DIR{$sym}[1]");
244 } 345 }
245 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 346 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
246 $self->{completer}->invoke_key_down ($ev); 347 $self->{completer}->inject_key_down ($ev);
247 $self->{completer}->show; 348 $self->{completer}->show;
248 } else { 349 } else {
249 return 0; 350 return 0;
250 } 351 }
251 352
… …
258 my $res = 0; 359 my $res = 0;
259 my $mod = $ev->{mod}; 360 my $mod = $ev->{mod};
260 my $sym = $ev->{sym}; 361 my $sym = $ev->{sym};
261 362
262 if ($::CFG->{shift_fire_stop}) { 363 if ($::CFG->{shift_fire_stop}) {
263 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 364 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
264 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
265 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
266 $res = 1; 367 $res = 1;
267 } 368 }
268 } else { 369 } else {
269 if (exists $DIR{$sym} && delete $self->{shft}) { 370 if (exists $DIR{$sym} && delete $self->{shft}) {
270 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
271 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
272 $res = 1; 373 $res = 1;
273 } 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?
274 $::CONN->user_send ("fire_stop"); 375 $::CONN->user_send ("fire_stop");
275 delete $self->{fire_dir}; 376 delete $self->{fire_dir};
276 $res = 1; 377 $res = 1;
277 } 378 }
278 } 379 }
279 380
280 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 381 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
281 $::CONN->user_send ("run_stop"); 382 $::CONN->user_send ("run_stop");
282 $res = 1; 383 $res = 1;
283 } 384 }
284 385
285 $res 386 $res
… …
299sub draw { 400sub draw {
300 my ($self) = @_; 401 my ($self) = @_;
301 402
302 return unless $::MAP; 403 return unless $::MAP;
303 404
304 my $focused = $CFClient::UI::FOCUS == $self 405 my $focused = $CFPlus::UI::FOCUS == $self
305 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 406 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
306 407
307 return 408 return
308 unless $focused || !$::FAST; 409 unless $focused || !$::FAST;
309 410
310 if (delete $self->{need_update}) { 411 if (delete $self->{need_update}) {
311 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 412 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
312 413
313 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 414 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
314 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 415 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
315 416
316 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 417 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
317 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 418 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
318 419
319 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 420 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
320 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 421 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
321 422
322 if ($::CFG->{fow_enable}) { 423 if ($::CFG->{fow_enable}) {
323 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);
324 425
325 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
326 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 427 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
327 glConvolutionFilter2D ( 428 glConvolutionFilter2D (
328 GL_CONVOLUTION_2D, 429 GL_CONVOLUTION_2D,
329 GL_ALPHA, 430 GL_ALPHA,
330 3, 3, 431 3, 3,
… …
332 (pack "f*", @{ $self->{smooth_matrix} }), 433 (pack "f*", @{ $self->{smooth_matrix} }),
333 ); 434 );
334 glEnable GL_CONVOLUTION_2D; 435 glEnable GL_CONVOLUTION_2D;
335 } 436 }
336 437
337 $self->{fow_texture} = new CFClient::Texture 438 $self->{fow_texture} = new CFPlus::Texture
338 w => $w, 439 w => $w,
339 h => $h, 440 h => $h,
340 data => $data, 441 data => $data,
341 internalformat => GL_ALPHA, 442 internalformat => GL_ALPHA,
342 format => GL_ALPHA; 443 format => GL_ALPHA;
… …
404 glDeleteList $self->{list}; 505 glDeleteList $self->{list};
405 506
406 $self->SUPER::DESTROY; 507 $self->SUPER::DESTROY;
407} 508}
408 509
409package CFClient::MapWidget::MapMap; 510package CFPlus::MapWidget::MapMap;
410 511
411our @ISA = CFClient::UI::Base::; 512our @ISA = CFPlus::UI::Base::;
412 513
413use Time::HiRes qw(time); 514use Time::HiRes qw(time);
414use CFClient::OpenGL; 515use CFPlus::OpenGL;
415 516
416sub size_request { 517sub size_request {
417 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 518 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
418} 519}
419 520
… …
455 556
456 if ($self->{texture_atime} < time) { 557 if ($self->{texture_atime} < time) {
457 $self->{texture_atime} = time + 1/3; 558 $self->{texture_atime} = time + 1/3;
458 559
459 $self->{texture} = 560 $self->{texture} =
460 new CFClient::Texture 561 new CFPlus::Texture
461 w => $w, 562 w => $w,
462 h => $h, 563 h => $h,
463 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 564 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
464 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;
465 } 566 }
466 567
467 $self->{texture}->draw_quad (0, 0); 568 $self->{texture}->draw_quad (0, 0);
468 569
469 glDisable GL_TEXTURE_2D; 570 glDisable GL_TEXTURE_2D;
… …
484 glEnd; 585 glEnd;
485 586
486 glDisable GL_BLEND; 587 glDisable GL_BLEND;
487} 588}
488 589
489package CFClient::MapWidget::Command; 590package CFPlus::MapWidget::Command;
490 591
491use strict; 592use strict;
492 593
493use CFClient::OpenGL; 594use CFPlus::OpenGL;
494 595
495our @ISA = CFClient::UI::Frame::; 596our @ISA = CFPlus::UI::Frame::;
496 597
497sub new { 598sub new {
498 my $class = shift; 599 my $class = shift;
499 600
500 my $self = $class->SUPER::new ( 601 my $self = $class->SUPER::new (
501 bg => [0, 0, 0, 0.8], 602 bg => [0, 0, 0, 0.8],
502 @_, 603 @_,
503 ); 604 );
504 605
505 $self->add ($self->{vbox} = new CFClient::UI::VBox); 606 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
506 607
507 $self->{label} = [ 608 $self->{label} = [
508 map 609 map
509 CFClient::UI::Label->new ( 610 CFPlus::UI::Label->new (
510 can_hover => 1, 611 can_hover => 1,
511 can_events => 1, 612 can_events => 1,
512 tooltip_width => 0.33, 613 tooltip_width => 0.33,
513 fontsize => $_, 614 fontsize => $_,
514 ), (0.8) x 16 615 ), (0.8) x 16
515 ]; 616 ];
516 617
517 $self->{entry} = new CFClient::UI::Entry 618 $self->{entry} = new CFPlus::UI::Entry
518 on_changed => sub { 619 on_changed => sub {
519 $self->update_labels; 620 $self->update_labels;
520 0 621 0
521 }, 622 },
522 on_button_down => sub { 623 on_button_down => sub {
523 my ($entry, $ev, $x, $y) = @_; 624 my ($entry, $ev, $x, $y) = @_;
524 625
525 if ($ev->{button} == 3) { 626 if ($ev->{button} == 3) {
526 (new CFClient::UI::Menu 627 (new CFPlus::UI::Menu
527 items => [ 628 items => [
528 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
529 => 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 }) }]
530 ], 631 ],
531 )->popup ($ev); 632 )->popup ($ev);
532 return 1; 633 return 1;
533 } 634 }
… …
549 $self->hide; 650 $self->hide;
550 } 651 }
551 } elsif ($ev->{sym} == 27) { 652 } elsif ($ev->{sym} == 27) {
552 $self->{hist_ptr} = 0; 653 $self->{hist_ptr} = 0;
553 $self->hide; 654 $self->hide;
554 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 655 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
555 if ($self->{hist_ptr} > 1) { 656 if ($self->{hist_ptr} > 1) {
556 $self->{hist_ptr}--; 657 $self->{hist_ptr}--;
557 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 658 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
558 } elsif ($self->{hist_ptr} > 0) { 659 } elsif ($self->{hist_ptr} > 0) {
559 $self->{hist_ptr}--; 660 $self->{hist_ptr}--;
… …
561 } else { 662 } else {
562 ++$self->{select_offset} 663 ++$self->{select_offset}
563 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 664 if $self->{select_offset} < $#{ $self->{last_match} || [] };
564 } 665 }
565 $self->update_labels; 666 $self->update_labels;
566 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 667 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
567 if ($self->{select_offset}) { 668 if ($self->{select_offset}) {
568 --$self->{select_offset} 669 --$self->{select_offset}
569 } else { 670 } else {
570 unless ($self->{hist_ptr}) { 671 unless ($self->{hist_ptr}) {
571 $self->{hist_saveback} = $self->{entry}->get_text; 672 $self->{hist_saveback} = $self->{entry}->get_text;
… …
616} 717}
617 718
618sub hide { 719sub hide {
619 my ($self) = @_; 720 my ($self) = @_;
620 721
722 $self->{hist_ptr} = 0;
723
621 $self->SUPER::hide; 724 $self->SUPER::hide;
622 $self->{entry}->set_text (""); 725 $self->{entry}->set_text ("");
623} 726}
624 727
625sub invoke_key_down { 728sub inject_key_down {
626 my ($self, $ev) = @_; 729 my ($self, $ev) = @_;
627 730
731 $self->{entry}->grab_focus;
628 $self->{entry}->emit (key_down => $ev) 732 $self->{entry}->emit (key_down => $ev);
629} 733}
630 734
631sub update_labels { 735sub update_labels {
632 my ($self) = @_; 736 my ($self) = @_;
633 737
… …
726 830
727sub _draw { 831sub _draw {
728 my ($self) = @_; 832 my ($self) = @_;
729 833
730 # hack 834 # hack
731 local $CFClient::UI::FOCUS = $self->{entry}; 835 local $CFPlus::UI::FOCUS = $self->{entry};
732 836
733 $self->SUPER::_draw; 837 $self->SUPER::_draw;
734} 838}
735 839
7361 8401

Diff Legend

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