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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.29 by root, Thu May 18 16:42:26 2006 UTC vs.
Revision 1.84 by root, Sun Oct 1 18:17:38 2006 UTC

…		…
1	package CFClient::MapWidget;	1	package CFPlus::MapWidget;
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
		8	use CFPlus;
8	use CFClient::OpenGL;	9	use CFPlus::OpenGL;
		10	use CFPlus::UI;
9		11
10	our @ISA = CFClient::UI::Base::;	12	our @ISA = CFPlus::UI::Base::;
		13
		14	my $magicmap_tex =
		15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
		16	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11		17
12	sub new {	18	sub new {
13	my $class = shift;	19	my $class = shift;
14		20
15	my $self = $class->SUPER::new (	21	my $self = $class->SUPER::new (
16	z => -1,	22	z => -1,
17	can_focus => 1,	23	can_focus => 1,
18	list => glGenList,	24	list => glGenList,
		25
		26	smooth_matrix => [
		27	0.05, 0.13, 0.05,
		28	0.13, 0.30, 0.13,
		29	0.05, 0.13, 0.05,
		30	],
		31
19	@_	32	@_
20	);	33	);
21		34
		35	$self->{completer} = new CFPlus::MapWidget::Command::
		36	command => $self->{command},
		37	tooltip => "#completer_help",
		38	;
		39
22	$self	40	$self
23	}	41	}
24		42
25	sub DESTROY {	43	sub add_command {
		44	my ($self, $command, $tooltip, $widget, $cb) = @_;
		45
		46	(my $data = $command) =~ s/\\//g;
		47
		48	$tooltip =~ s/^\s+//;
		49	$tooltip = "<big>$data</big>\n\n$tooltip";
		50	$tooltip =~ s/\s+$//;
		51
		52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		53	}
		54
		55	sub clr_commands {
26	my $self = shift;	56	my ($self) = @_;
27		57
28	glDeleteList $self->{list};	58	%{$self->{completer}{command}} = ();
29		59
30	$self->SUPER::DESTROY;	60	$self->{completer}->hide
		61	if $self->{completer};
31	}	62	}
32		63
		64	sub 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
		74	sub 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	}
		146	}
		147
33	sub button_down {	148	sub invoke_button_down {
34	my ($self, $ev, $x, $y) = @_;	149	my ($self, $ev, $x, $y) = @_;
35		150
36	$self->focus_in;
37
38	if ($ev->{button} == 2) {	151	if ($ev->{button} == 1) {
		152	$self->grab_focus;
		153	return unless $::CONN;
		154
		155	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
		156	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
		157
		158	$x -= int 0.5 * $self->{sw};
		159	$y -= int 0.5 * $self->{sh};
		160
		161	$::CONN->lookat ($x, $y)
		162	if $::CONN;
		163
		164	} elsif ($ev->{button} == 2) {
		165	$self->grab_focus;
		166	return unless $::CONN;
		167
39	my ($ox, $oy) = ($ev->{x}, $ev->{y});	168	my ($ox, $oy) = ($ev->{x}, $ev->{y});
40	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	169	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
41		170
42	$self->{motion} = sub {	171	$self->{motion} = sub {
43	my ($ev, $x, $y) = @_;	172	my ($ev, $x, $y) = @_;
47	$::CFG->{map_shift_x} = $bw + $x - $ox;	176	$::CFG->{map_shift_x} = $bw + $x - $ox;
48	$::CFG->{map_shift_y} = $bh + $y - $oy;	177	$::CFG->{map_shift_y} = $bh + $y - $oy;
49		178
50	$self->update;	179	$self->update;
51	};	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);
		216	}
		217
52	}	218	1
53	}	219	}
54		220
55	sub button_up {	221	sub invoke_button_up {
56	my ($self, $ev, $x, $y) = @_;	222	my ($self, $ev, $x, $y) = @_;
57		223
58	delete $self->{motion};	224	delete $self->{motion};
59	}
60		225
		226	1
		227	}
		228
61	sub mouse_motion {	229	sub invoke_mouse_motion {
62	my ($self, $ev, $x, $y) = @_;	230	my ($self, $ev, $x, $y) = @_;
63		231
		232	if ($self->{motion}) {
64	$self->{motion}->($ev, $x, $y) if $self->{motion};	233	$self->{motion}->($ev, $x, $y);
		234	} else {
		235	return 0;
		236	}
		237
		238	1
65	}	239	}
66		240
67	sub size_request {	241	sub size_request {
68	(	242	(
69	1 + 32 * int $::WIDTH / 32,	243	32 * CFPlus::ceil $::WIDTH / 32,
70	1 + 32 * int $::HEIGHT / 32,	244	32 * CFPlus::ceil $::HEIGHT / 32,
71	)	245	)
72	}	246	}
73		247
74	sub update {	248	sub update {
75	my ($self) = @_;	249	my ($self) = @_;
76		250
77	$self->{need_update} = 1;	251	$self->{need_update} = 1;
78	$self->SUPER::update;	252	$self->SUPER::update;
79	}	253	}
80		254
		255	my %DIR = (
		256	CFPlus::SDLK_KP8, [1, "north"],
		257	CFPlus::SDLK_KP9, [2, "northeast"],
		258	CFPlus::SDLK_KP6, [3, "east"],
		259	CFPlus::SDLK_KP3, [4, "southeast"],
		260	CFPlus::SDLK_KP2, [5, "south"],
		261	CFPlus::SDLK_KP1, [6, "southwest"],
		262	CFPlus::SDLK_KP4, [7, "west"],
		263	CFPlus::SDLK_KP7, [8, "northwest"],
		264
		265	CFPlus::SDLK_UP, [1, "north"],
		266	CFPlus::SDLK_RIGHT, [3, "east"],
		267	CFPlus::SDLK_DOWN, [5, "south"],
		268	CFPlus::SDLK_LEFT, [7, "west"],
		269	);
		270
		271	sub invoke_key_down {
		272	my ($self, $ev) = @_;
		273
		274	my $mod = $ev->{mod};
		275	my $sym = $ev->{sym};
		276	my $uni = $ev->{unicode};
		277
		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) {
		311	$::CONN->user_send ("stay fire");
		312	} elsif ($uni == ord ",") {
		313	$::CONN->user_send ("take");
		314	} elsif ($uni == ord " ") {
		315	$::CONN->user_send ("apply");
		316	} elsif ($uni == 13) {
		317	$::CONN->user_send ("examine");
		318	} elsif ($uni == ord ".") {
		319	$::CONN->user_send ($self->{completer}{last_command})
		320	if exists $self->{completer}{last_command};
		321	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
		322	$::CONN->user_send ($_) for @$bind_cmd;
		323	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
		324	$::CONN->user_send ("rotateshoottype +");
		325	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
		326	$::CONN->user_send ("rotateshoottype -");
		327	} elsif ($uni == ord '"') {
		328	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		329	$self->{completer}->show;
		330	} elsif ($uni == ord "'") {
		331	$self->{completer}->set_prefix ("");
		332	$self->{completer}->show;
		333	} elsif (exists $DIR{$sym}) {
		334	if ($mod & CFPlus::KMOD_SHIFT) {
		335	$self->{shft}++;
		336	if ($DIR{$sym}[0] != $self->{fire_dir}) {
		337	$::CONN->user_send ("fire $DIR{$sym}[0]");
		338	}
		339	$self->{fire_dir} = $DIR{$sym}[0];
		340	} elsif ($mod & CFPlus::KMOD_CTRL) {
		341	$self->{ctrl}++;
		342	$::CONN->user_send ("run $DIR{$sym}[0]");
		343	} else {
		344	$::CONN->user_send ("$DIR{$sym}[1]");
		345	}
		346	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
		347	$self->{completer}->inject_key_down ($ev);
		348	$self->{completer}->show;
		349	} else {
		350	return 0;
		351	}
		352
		353	1
		354	}
		355
		356	sub invoke_key_up {
		357	my ($self, $ev) = @_;
		358
		359	my $res = 0;
		360	my $mod = $ev->{mod};
		361	my $sym = $ev->{sym};
		362
		363	if ($::CFG->{shift_fire_stop}) {
		364	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
		365	$::CONN->user_send ("fire_stop");
		366	delete $self->{fire_dir};
		367	$res = 1;
		368	}
		369	} else {
		370	if (exists $DIR{$sym} && delete $self->{shft}) {
		371	$::CONN->user_send ("fire_stop");
		372	delete $self->{fire_dir};
		373	$res = 1;
		374	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
		375	$::CONN->user_send ("fire_stop");
		376	delete $self->{fire_dir};
		377	$res = 1;
		378	}
		379	}
		380
		381	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
		382	$::CONN->user_send ("run_stop");
		383	$res = 1;
		384	}
		385
		386	$res
		387	}
		388
		389	sub set_magicmap {
		390	my ($self, $w, $h, $x, $y, $data) = @_;
		391
		392	$x -= $::MAP->ox + int 0.5 * $::MAP->w;
		393	$y -= $::MAP->oy + int 0.5 * $::MAP->h;
		394
		395	$self->{magicmap} = [$x, $y, $w, $h, $data];
		396
		397	$self->update;
		398	}
		399
81	sub draw {	400	sub draw {
82	my ($self) = @_;	401	my ($self) = @_;
83		402
		403	return unless $::MAP;
		404
		405	my $focused = $CFPlus::UI::FOCUS == $self
		406	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		407
84	return	408	return
85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;	409	unless $focused \|\| !$::FAST;
86		410
87	if (delete $self->{need_update}) {	411	if (delete $self->{need_update}) {
		412	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
		413
		414	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
		415	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
		416
		417	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		418	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		419
		420	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		421	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		422
		423	if ($::CFG->{fow_enable}) {
		424	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
		425
		426	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
		427	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
		428	glConvolutionFilter2D (
		429	GL_CONVOLUTION_2D,
		430	GL_ALPHA,
		431	3, 3,
		432	GL_ALPHA, GL_FLOAT,
		433	(pack "f*", @{ $self->{smooth_matrix} }),
		434	);
		435	glEnable GL_CONVOLUTION_2D;
		436	}
		437
		438	$self->{fow_texture} = new CFPlus::Texture
		439	w => $w,
		440	h => $h,
		441	data => $data,
		442	internalformat => GL_ALPHA,
		443	format => GL_ALPHA;
		444
		445	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		446	} else {
		447	delete $self->{fow_texture};
		448	}
		449
88	glNewList $self->{list};	450	glNewList $self->{list};
89		451
90	if ($::MAP) {
91	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
92	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
93
94	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
95	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
96
97	glPushMatrix;	452	glPushMatrix;
		453	glTranslate $sx0, $sy0;
98	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	454	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
99		455
100	glTranslate $sx0 - 32, $sy0 - 32, 0;	456	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
101		457
102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	458	glScale 32, 32;
103		459
104	if ($::CFG->{fow_enable}) {	460	if (my $tex = $self->{fow_texture}) {
105	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
106	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107	glConvolutionFilter2D (
108	GL_CONVOLUTION_2D,
109	GL_ALPHA,
110	3, 3,
111	GL_ALPHA, GL_FLOAT,
112	pack "f*",
113	0.05, 0.13, 0.05,
114	0.13, 0.30, 0.13,
115	0.05, 0.13, 0.05,
116	);
117	glEnable GL_CONVOLUTION_2D;
118	}
119
120	$self->{fow_texture} = new CFClient::Texture
121	w => $w,
122	h => $h,
123	data => $data,
124	internalformat => GL_ALPHA,
125	format => GL_ALPHA;
126
127	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
128
129	glEnable GL_BLEND;
130	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
131	glEnable GL_TEXTURE_2D;	461	glEnable GL_TEXTURE_2D;
132	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	462	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
133		463
134	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	464	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
135	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	465	$self->{fow_texture}->draw_quad_alpha (0, 0);
136		466
137	glDisable GL_TEXTURE_2D;	467	glDisable GL_TEXTURE_2D;
138	glDisable GL_BLEND;
139	}	468	}
140		469
		470	if ($self->{magicmap}) {
		471	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		472
		473	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
		474	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
		475
		476	glTranslate - $x - 1, - $y - 1;
		477	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		478	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		479	}
		480
141	glPopMatrix;	481	glPopMatrix;
142	}
143
144	glEndList;	482	glEndList;
145	}	483	}
146		484
147	glPushMatrix;
148	glCallList $self->{list};	485	glCallList $self->{list};
149	glPopMatrix;
150		486
151	# TNT2 emulates logops in software (or worse :)	487	# TNT2 emulates logops in software (or worse :)
152	if ($CFClient::UI::FOCUS != $self) {	488	unless ($focused) {
153	glColor 0.4, 0.2, 0.2, 0.9;	489	glColor 0.4, 0.2, 0.2, 0.6;
154	glEnable GL_BLEND;	490	glEnable GL_BLEND;
155	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
156	glBegin GL_QUADS;	492	glBegin GL_QUADS;
157	glVertex 0, 0;	493	glVertex 0, 0;
158	glVertex 0, $::HEIGHT;	494	glVertex 0, $::HEIGHT;
…		…
161	glEnd;	497	glEnd;
162	glDisable GL_BLEND;	498	glDisable GL_BLEND;
163	}	499	}
164	}	500	}
165		501
166	my %DIR = (	502	sub DESTROY {
167	CFClient::SDLK_KP8, [1, "north"],
168	CFClient::SDLK_KP9, [2, "northeast"],
169	CFClient::SDLK_KP6, [3, "east"],
170	CFClient::SDLK_KP3, [4, "southeast"],
171	CFClient::SDLK_KP2, [5, "south"],
172	CFClient::SDLK_KP1, [6, "southwest"],
173	CFClient::SDLK_KP4, [7, "west"],
174	CFClient::SDLK_KP7, [8, "northwest"],
175
176	CFClient::SDLK_UP, [1, "north"],
177	CFClient::SDLK_RIGHT, [3, "east"],
178	CFClient::SDLK_DOWN, [5, "south"],
179	CFClient::SDLK_LEFT, [7, "west"],
180	);
181
182	sub key_down {
183	my ($self, $ev) = @_;
184
185	return unless $::CONN;
186
187	my $mod = $ev->{mod};
188	my $sym = $ev->{sym};
189	my $uni = $ev->{unicode};
190
191	if ($sym == CFClient::SDLK_KP5) {
192	$::CONN->user_send ("stay fire");
193	} elsif ($uni == ord ",") {
194	$::CONN->user_send ("take");
195	} elsif ($uni == ord "\t" or $uni == ord " ") {
196	$::CONN->user_send ("apply");
197	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
198	$::CONN->user_send ("rotateshoottype +");
199	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
200	$::CONN->user_send ("rotateshoottype -");
201	} elsif ($uni == ord "'") {
202	$self->emit ('activate_console');
203	} elsif ($uni == ord "/") {
204	$self->emit (activate_console => '/');
205	} elsif (exists $DIR{$sym}) {
206	if ($mod & CFClient::KMOD_SHIFT) {
207	$self->{shft}++;
208	$::CONN->user_send ("fire $DIR{$sym}[0]");
209	} elsif ($mod & CFClient::KMOD_CTRL) {
210	$self->{ctrl}++;
211	$::CONN->user_send ("run $DIR{$sym}[0]");
212	} else {
213	$::CONN->user_send ("$DIR{$sym}[1]");
214	}
215	} elsif ($ev->{unicode}) {
216	$self->{command_widget} \|\|=
217	new CFClient::MapWidget::Command::
218	command => $self->{command},
219	can_focus => 1,
220	connect_execute => sub {
221	# todo: support callback instead of user_send
222	$::CONN->user_send ($_[1]);
223	},
224	connect_close => sub {
225	(delete $self->{command_widget})->hide;
226	$self->focus_in;
227	},
228	;
229	$self->{command_widget}->key_down ($ev)
230	unless $ev->{unicode} == 20;
231	return unless $self->{command_widget};
232	$self->{command_widget}->show;
233	$self->{command_widget}->focus_in;
234	}
235	}
236
237	sub key_up {
238	my ($self, $ev) = @_;
239
240	my $mod = $ev->{mod};
241	my $sym = $ev->{sym};
242
243	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
244	$::CONN->user_send ("fire_stop");
245	}
246	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
247	$::CONN->user_send ("run_stop");
248	}
249	}
250
251	sub add_command {
252	my ($self, $command, $tooltip, $widget, $cb) = @_;
253
254	(my $data = $command) =~ s/\\//g;
255
256	$tooltip =~ s/^\s+//;
257
258	$tooltip = "<big>$data</big>\n\n$tooltip";
259
260	$tooltip =~ s/\s+$//;
261
262	$self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
263	}
264
265	sub clr_commands {
266	my ($self) = @_;	503	my $self = shift;
267		504
268	%{$self->{command}} = ();	505	glDeleteList $self->{list};
269	}
270		506
		507	$self->SUPER::DESTROY;
		508	}
		509
271	package CFClient::MapWidget::MapMap;	510	package CFPlus::MapWidget::MapMap;
272		511
273	our @ISA = CFClient::UI::Base::;	512	our @ISA = CFPlus::UI::Base::;
274		513
275	use Time::HiRes qw(time);	514	use Time::HiRes qw(time);
276	use CFClient::OpenGL;	515	use CFPlus::OpenGL;
277		516
278	sub size_request {	517	sub size_request {
279	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	518	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
280	}	519	}
281		520
282	sub size_allocate {	521	sub invoke_size_allocate {
283	my ($self, $w, $h) = @_;	522	my ($self, $w, $h) = @_;
284		523
285	$self->SUPER::size_allocate ($w, $h);
286	$self->update;	524	$self->update;
		525
		526	1
287	}	527	}
288		528
289	sub update {	529	sub update {
290	my ($self) = @_;	530	my ($self) = @_;
291		531
…		…
316		556
317	if ($self->{texture_atime} < time) {	557	if ($self->{texture_atime} < time) {
318	$self->{texture_atime} = time + 1/3;	558	$self->{texture_atime} = time + 1/3;
319		559
320	$self->{texture} =	560	$self->{texture} =
321	new CFClient::Texture	561	new CFPlus::Texture
322	w => $w,	562	w => $w,
323	h => $h,	563	h => $h,
324	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	564	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
325	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;
326	}	566	}
327		567
328	$self->{texture}->draw_quad (0, 0);	568	$self->{texture}->draw_quad (0, 0);
329		569
330	glDisable GL_TEXTURE_2D;	570	glDisable GL_TEXTURE_2D;
…		…
345	glEnd;	585	glEnd;
346		586
347	glDisable GL_BLEND;	587	glDisable GL_BLEND;
348	}	588	}
349		589
350	package CFClient::MapWidget::Command;	590	package CFPlus::MapWidget::Command;
351		591
352	use strict;	592	use strict;
353		593
354	use CFClient::OpenGL;	594	use CFPlus::OpenGL;
355		595
356	our @ISA = CFClient::UI::Frame::;	596	our @ISA = CFPlus::UI::Frame::;
357		597
358	sub new {	598	sub new {
359	my $class = shift;	599	my $class = shift;
360		600
361	my $self = $class->SUPER::new (	601	my $self = $class->SUPER::new (
362	bg => [0, 0, 0, 0.8],	602	bg => [0, 0, 0, 0.8],
363	@_,	603	@_,
364	);	604	);
365		605
366	$self->add ($self->{vbox} = new CFClient::UI::VBox);	606	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
367		607
368	$self->{label} = [	608	$self->{label} = [
369	map	609	map
370	CFClient::UI::Label->new (	610	CFPlus::UI::Label->new (
371	can_hover => 1,	611	can_hover => 1,
372	can_events => 1,	612	can_events => 1,
373	tooltip_width => 0.33,	613	tooltip_width => 0.33,
374	fontsize => $_,	614	fontsize => $_,
375	), (0.8) x 16	615	), (0.8) x 16
376	];	616	];
377		617
378	$self->{entry} = new CFClient::UI::Entry	618	$self->{entry} = new CFPlus::UI::Entry
379	connect_changed => sub {	619	on_changed => sub {
380	$self->update_labels;	620	$self->update_labels;
		621	0
		622	},
		623	on_button_down => sub {
		624	my ($entry, $ev, $x, $y) = @_;
		625
		626	if ($ev->{button} == 3) {
		627	(new CFPlus::UI::Menu
		628	items => [
		629	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
		630	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
		631	],
		632	)->popup ($ev);
		633	return 1;
		634	}
		635	0
		636	},
		637	on_key_down => sub {
		638	my ($entry, $ev) = @_;
		639
		640	my $self = $entry->{parent}{parent};
		641
		642	if ($ev->{sym} == 13) {
		643	if (exists $self->{select}) {
		644	$self->{last_command} = $self->{select};
		645	$::CONN->user_send ($self->{select});
		646
		647	unshift @{$self->{history}}, $self->{entry}->get_text;
		648	$self->{hist_ptr} = 0;
		649
		650	$self->hide;
		651	}
		652	} elsif ($ev->{sym} == 27) {
		653	$self->{hist_ptr} = 0;
		654	$self->hide;
		655	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
		656	if ($self->{hist_ptr} > 1) {
		657	$self->{hist_ptr}--;
		658	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		659	} elsif ($self->{hist_ptr} > 0) {
		660	$self->{hist_ptr}--;
		661	$self->{entry}->set_text ($self->{hist_saveback});
		662	} else {
		663	++$self->{select_offset}
		664	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		665	}
		666	$self->update_labels;
		667	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {
		668	if ($self->{select_offset}) {
		669	--$self->{select_offset}
		670	} else {
		671	unless ($self->{hist_ptr}) {
		672	$self->{hist_saveback} = $self->{entry}->get_text;
		673	}
		674	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		675	$self->{hist_ptr}++;
		676	}
		677	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		678	if exists $self->{history}->[$self->{hist_ptr} - 1];
		679	}
		680	$self->update_labels;
		681	} else {
		682	return 0;
		683	}
		684
		685	1
381	};	686	}
		687	;
382		688
383	$self->{vbox}->add (	689	$self->{vbox}->add (
384	$self->{entry},	690	$self->{entry},
385	@{$self->{label}},	691	@{$self->{label}},
386	);	692	);
387		693
388	$self	694	$self
389	}	695	}
390		696
		697	sub set_prefix {
		698	my ($self, $prefix) = @_;
		699
		700	$self->{entry}->set_text ($prefix);
		701	$self->show;
		702	}
		703
391	sub size_allocate {	704	sub invoke_size_allocate {
392	my ($self, $w, $h) = @_;	705	my ($self, $w, $h) = @_;
393		706
394	$self->SUPER::size_allocate ($w, $h);
395	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	707	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
396	}
397		708
		709	$self->SUPER::invoke_size_allocate ($w, $h)
		710	}
		711
		712	sub show {
		713	my ($self) = @_;
		714
		715	$self->SUPER::show;
		716	$self->{entry}->grab_focus;
		717	}
		718
		719	sub hide {
		720	my ($self) = @_;
		721
		722	$self->{hist_ptr} = 0;
		723
		724	$self->SUPER::hide;
		725	$self->{entry}->set_text ("");
		726	}
		727
398	sub key_down {	728	sub inject_key_down {
399	my ($self, $ev) = @_;	729	my ($self, $ev) = @_;
400		730
401	if ($ev->{sym} == 13) {	731	$self->{entry}->grab_focus;
402	if (exists $self->{select}) {
403	$self->emit (execute => $self->{select});
404	$self->emit ("close");
405	}
406	} elsif ($ev->{sym} == 27) {
407	$self->{entry}->set_text ("");
408	$self->emit ("close");
409	return;
410	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
411	++$self->{select_offset}
412	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
413	$self->update_labels;
414	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
415	--$self->{select_offset}
416	if $self->{select_offset};
417	$self->update_labels;
418	} else {
419	#$self->{entry}{force_alloc} = 1;
420	$self->{entry}->key_down ($ev);	732	$self->{entry}->emit (key_down => $ev);
421	}
422	}	733	}
423		734
424	sub update_labels {	735	sub update_labels {
425	my ($self) = @_;	736	my ($self) = @_;
426		737
427	my $text = $self->{entry}->get_text;	738	my $text = $self->{entry}->get_text;
428		739
429	length $text	740	length $text
430	or return $self->emit ("close");	741	or return $self->hide;
431		742
432	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;	743	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
433		744
434	if ($cmd ne $self->{last_search}) {	745	if ($text ne $self->{last_search}) {
435	my $regexp = do {
436	my ($beg, @chr) = split //, lc $cmd;
437
438	# the following regex is used to match our "completion entry"
439	# to an actual command - the parentheses match kind of "overhead"
440	# - the more characters the parentheses match, the less attractive
441	# is the match.
442	my $regexp = "^\Q$beg\E"
443	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
444	qr<$regexp>
445	};
446
447	my @match;	746	my @match;
		747
		748	if ($text =~ /^(.*?)\s+$/) {
		749	@match = [$cmd, "(appended whitespace suppresses completion)"];
		750	} else {
		751	my $regexp = do {
		752	my ($beg, @chr) = split //, lc $cmd;
		753
		754	# the following regex is used to match our "completion entry"
		755	# to an actual command - the parentheses match kind of "overhead"
		756	# - the more characters the parentheses match, the less attractive
		757	# is the match.
		758	my $regexp = "^\Q$beg\E"
		759	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		760	qr<$regexp>
		761	};
		762
448	my @penalty;	763	my @penalty;
449		764
450	for (keys %{$self->{command}}) {	765	for (keys %{$self->{command}}) {
451	if (@penalty = $_ =~ $regexp) {	766	if (@penalty = $_ =~ $regexp) {
452	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	767	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		768	}
453	}	769	}
454	}
455		770
456	@match = map $self->{command}{$_->[0]},	771	@match = map $self->{command}{$_->[0]},
457	sort {	772	sort {
458	$a->[1] <=> $b->[1]	773	$a->[1] <=> $b->[1]
459	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	774	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		775	or (length $b->[0]) <=> (length $a->[0])
460	} @match;	776	} @match;
		777	}
461		778
462	$self->{last_search} = $cmd;	779	$self->{last_search} = $text;
463	$self->{last_match} = \@match;	780	$self->{last_match} = \@match;
464		781
465	$self->{select_offset} = 0;	782	$self->{select_offset} = 0;
466	}	783	}
467		784
…		…
507	$label->set_text ("");	824	$label->set_text ("");
508	$label->set_tooltip ("");	825	$label->set_tooltip ("");
509	}	826	}
510		827
511	$self->update;	828	$self->update;
512	###
513	}	829	}
514		830
515	sub _draw {	831	sub _draw {
516	my ($self) = @_;	832	my ($self) = @_;
517		833
518	# hack	834	# hack
519	local $CFClient::UI::FOCUS = $self->{entry};	835	local $CFPlus::UI::FOCUS = $self->{entry};
520		836
521	$self->SUPER::_draw;	837	$self->SUPER::_draw;
522	}	838	}
523		839
524	1	840	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.29 by root, Thu May 18 16:42:26 2006 UTC vs. Revision 1.84 by root, Sun Oct 1 18:17:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.29 by root, Thu May 18 16:42:26 2006 UTC vs.
Revision 1.84 by root, Sun Oct 1 18:17:38 2006 UTC