[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/MapWidget.pm

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.116 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.124 by root, Wed Dec 26 18:09:30 2007 UTC

…		…
24	can_focus => 1,	24	can_focus => 1,
25	tilesize => 32,	25	tilesize => 32,
26	@_	26	@_
27	);	27	);
28		28
29	$self->{completer} = new CFPlus::MapWidget::Command::
30	command => $self->{command},
31	tooltip => "#completer_help",
32	;
33
34	$self	29	$self
35	}	30	}
36		31
37	sub set_tilesize {	32	sub set_tilesize {
38	my ($self, $tilesize) = @_;	33	my ($self, $tilesize) = @_;
…		…
47		42
48	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
49	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
50	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
51		46
52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53	}	48	}
54		49
55	sub clr_commands {	50	sub clr_commands {
56	my ($self) = @_;	51	my ($self) = @_;
57		52
58	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
59		54
60	$self->{completer}->hide	55	$::COMPLETER->hide
61	if $self->{completer};	56	if $::COMPLETER;
62	}	57	}
63		58
64	sub server_login {	59	sub server_login {
65	my ($server) = @_;	60	my ($server) = @_;
66		61
…		…
77	print "preparing editor startup...\n";	72	print "preparing editor startup...\n";
78		73
79	my $server = $editsup->{gameserver} \|\| "default";	74	my $server = $editsup->{gameserver} \|\| "default";
80	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
81		76
82	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;	77	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
83	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;	78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
84		79
85	print "map directory is $mapdir\n";	80	print "map directory is $mapdir\n";
86	print "lib directory is $libdir\n";	81	print "lib directory is $libdir\n";
87		82
88	my $ua = CFPlus::lwp_useragent;	83	my $ua = CFPlus::lwp_useragent;
…		…
125	require File::Path;	120	require File::Path;
126		121
127	File::Path::mkpath (File::Basename::dirname ($mappath));	122	File::Path::mkpath (File::Basename::dirname ($mappath));
128	open my $fh, ">:raw:perlio", "$mappath.meta"	123	open my $fh, ">:raw:perlio", "$mappath.meta"
129	or die "$mappath.meta: $!\n";	124	or die "$mappath.meta: $!\n";
130	print $fh CFPlus::to_json $meta;	125	print $fh CFPlus::encode_json $meta;
131	close $fh;	126	close $fh;
132	open my $fh, ">:raw:perlio:utf8", $mappath	127	open my $fh, ">:raw:perlio:utf8", $mappath
133	or die "$mappath: $!\n";	128	or die "$mappath: $!\n";
134	print $fh $map;	129	print $fh $map;
135	close $fh;	130	close $fh;
…		…
325	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
326	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
327		322
328	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
329		324
330	if ($sym == 9) {
331	($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
332	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
333	$::HELP_WINDOW->toggle_visibility;
334	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
335	::toggle_player_page ($::STATS_PAGE);
336	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
337	::toggle_player_page ($::SKILL_PAGE);
338	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
339	::toggle_player_page ($::SPELL_PAGE);
340	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
341	::toggle_player_page ($::INVENTORY_PAGE);
342	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
343	$::SETUP_DIALOG->toggle_visibility;
344	} elsif (!$::CONN) {
345	return 0; # bindings further down need a valid connection
346
347	} elsif ($uni == ord ",") {
348	$::CONN->user_send ("take");
349	} elsif ($uni == ord " ") {
350	$::CONN->user_send ("apply");
351	} elsif ($uni == 13) {
352	$::CONN->user_send ("examine");
353	} elsif ($uni == ord ".") {
354	$::CONN->user_send ($self->{completer}{last_command})
355	if exists $self->{completer}{last_command};
356	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
357	$::CONN->macro_send ($_) for @macros;
358	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
359	$::CONN->user_send ("rotateshoottype +");
360	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
361	$::CONN->user_send ("rotateshoottype -");
362	} elsif ($uni == ord '!') {
363	$self->{completer}->set_prefix ("shout ");
364	$self->{completer}->show;
365	} elsif ($uni == ord '"') {
366	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
367	$self->{completer}->show;
368	} elsif ($uni == ord "'") {
369	$self->{completer}->set_prefix ("");
370	$self->{completer}->show;
371	} elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
372	if ($mod & CFPlus::KMOD_SHIFT) {	326	if ($mod & CFPlus::KMOD_SHIFT) {
373	$self->{shft}++;	327	$self->{shft}++;
374	if ($dir->[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
375	$::CONN->user_send ("fire $dir->[0]");	329	$::CONN->user_send ("fire $dir->[0]");
376	}	330	}
377	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $dir->[0];
378	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & CFPlus::KMOD_CTRL) {
379	$self->{ctrl}++;	333	$self->{ctrl}++;
380	$::CONN->user_send ("run $dir->[0]");	334	$::CONN->user_send ("run $dir->[0]");
381	} else {	335	} else {
382	$::CONN->user_send ("$dir->[1]");	336	$::CONN->user_send ("$dir->[1]");
383	}	337	}
384	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
385	$self->{completer}->inject_key_down ($ev);
386	$self->{completer}->show;
387	} else {
388	return 0;	339	return 1;
389	}
390
391	1	340	}
		341
		342	0
392	}	343	}
393		344
394	sub invoke_key_up {	345	sub invoke_key_up {
395	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
396		347
…		…
403	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
404	delete $self->{fire_dir};	355	delete $self->{fire_dir};
405	$res = 1;	356	$res = 1;
406	}	357	}
407	} else {	358	} else {
408	if (exists $DIR{$sym} && delete $self->{shft}) {	359	if (exists $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
409	$::CONN->user_send ("fire_stop");	360	$::CONN->user_send ("fire_stop");
410	delete $self->{fire_dir};	361	delete $self->{fire_dir};
411	$res = 1;	362	$res = 1;
412	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	363	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT)
		364	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
413	$::CONN->user_send ("fire_stop");	365	$::CONN->user_send ("fire_stop");
414	delete $self->{fire_dir};	366	delete $self->{fire_dir};
415	$res = 1;	367	$res = 1;
416	}	368	}
417	}	369	}
…		…
479		431
480	glPushMatrix;	432	glPushMatrix;
481	glTranslate $sx0, $sy0;	433	glTranslate $sx0, $sy0;
482	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	434	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
483		435
484	my $missing = $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});	436	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
485		437
486	glScale $self->{tilesize}, $self->{tilesize};	438	glScale $self->{tilesize}, $self->{tilesize};
487		439
488	if (my $tex = $self->{fow_texture}) {	440	if (my $tex = $self->{fow_texture}) {
489	glPushMatrix;	441	glPushMatrix;
…		…
509	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);	461	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
510	}	462	}
511		463
512	glPopMatrix;	464	glPopMatrix;
513	glEndList;	465	glEndList;
514
515	for my $tile (@$missing) {
516	$tile = $::CONN->{texture}[$tile]
517	or next;
518	next if $tile->{loading};
519	$tile->upload;
520	}
521	}	466	}
522	} else {	467	} else {
523	glDeleteList delete $self->{list}	468	glDeleteList delete $self->{list}
524	if $self->{list};	469	if $self->{list};
525	}	470	}
…		…
531	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });	476	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
532		477
533	return unless $self->{list};	478	return unless $self->{list};
534		479
535	my $focused = $CFPlus::UI::FOCUS == $self	480	my $focused = $CFPlus::UI::FOCUS == $self
536	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	481	\|\| $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
537		482
538	return	483	return
539	unless $focused \|\| !$::FAST;	484	unless $focused \|\| !$::FAST;
540		485
541	glCallList $self->{list};	486	glCallList $self->{list};
542		487
543	# TNT2 emulates logops in software (or worse :)	488	# TNT2 emulates logops in software (or worse :)
544	unless ($focused) {	489	unless ($focused) {
545	glColor 0.4, 0.2, 0.2, 0.6;	490	glColor_premultiply 0, 0, 1, 0.25;
546	glEnable GL_BLEND;	491	glEnable GL_BLEND;
547	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
548	glBegin GL_QUADS;	493	glBegin GL_QUADS;
549	glVertex 0, 0;	494	glVertex 0, 0;
550	glVertex 0, $::HEIGHT;	495	glVertex 0, $::HEIGHT;
551	glVertex $::WIDTH, $::HEIGHT;	496	glVertex $::WIDTH, $::HEIGHT;
552	glVertex $::WIDTH, 0;	497	glVertex $::WIDTH, 0;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.116 by root, Mon Aug 6 05:06:33 2007 UTC vs. Revision 1.124 by root, Wed Dec 26 18:09:30 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.116 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.124 by root, Wed Dec 26 18:09:30 2007 UTC