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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs.
Revision 1.79 by elmex, Mon Jul 24 12:25:09 2006 UTC

1	package CFClient::MapWidget;	1	package CFClient::MapWidget;
2		2
3	use strict;	3	use strict;
		4	use utf8;
4		5
5	use List::Util qw(min max);	6	use List::Util qw(min max);
6		7
7	use SDL;	8	use CFClient;
8	use SDL::OpenGL;	9	use CFClient::OpenGL;
		10	use CFClient::UI;
9		11
10	our @ISA = CFClient::UI::Base::;	12	our @ISA = CFClient::UI::Base::;
		13
		14	my $magicmap_tex =
		15	new_from_file CFClient::Texture CFClient::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	$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 => (glGenLists 1),	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	}
22		34
23	sub key_down {	35	$self->{completer} = new CFClient::MapWidget::Command::
24	print "MAPKEYDOWN\n";	36	command => $self->{command},
25	}	37	tooltip => "<b>The Command Completer</b>\n\n"
		38	. "This is your central interface to send text commands to the server. "
		39	. "To enter a verbatim command to send to the server, just type the command, "
		40	. "followed by a space, and press return. "
		41	. "Typing the initial letters of words (or just any letters) displays guesses "
		42	. "for commands you might want to use.\n"
		43	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
		44	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
		45	;
26		46
27	sub key_up {	47	$self
28	}	48	}
29		49
		50	sub add_command {
		51	my ($self, $command, $tooltip, $widget, $cb) = @_;
		52
		53	(my $data = $command) =~ s/\\//g;
		54
		55	$tooltip =~ s/^\s+//;
		56	$tooltip = "<big>$data</big>\n\n$tooltip";
		57	$tooltip =~ s/\s+$//;
		58
		59	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		60	}
		61
		62	sub clr_commands {
		63	my ($self) = @_;
		64
		65	%{$self->{completer}{command}} = ();
		66
		67	$self->{completer}->hide
		68	if $self->{completer};
		69	}
		70
30	sub button_down {	71	sub invoke_button_down {
31	my ($self, $ev, $x, $y) = @_;	72	my ($self, $ev, $x, $y) = @_;
32		73
33	$self->focus_in;
34
35	if ($ev->button == 2) {	74	if ($ev->{button} == 1) {
		75	$self->grab_focus;
		76	return unless $::CONN;
		77
		78	my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
		79	my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
		80
		81	$x -= int 0.5 * $self->{sw};
		82	$y -= int 0.5 * $self->{sh};
		83
		84	$::CONN->lookat ($x, $y)
		85	if $::CONN;
		86
		87	} elsif ($ev->{button} == 2) {
		88	$self->grab_focus;
		89	return unless $::CONN;
		90
36	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	91	my ($ox, $oy) = ($ev->{x}, $ev->{y});
37	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	92	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
38		93
39	$self->{motion} = sub {	94	$self->{motion} = sub {
40	my ($ev, $x, $y) = @_;	95	my ($ev, $x, $y) = @_;
41		96
42	($x, $y) = ($ev->motion_x, $ev->motion_y);	97	($x, $y) = ($ev->{x}, $ev->{y});
43		98
44	$::CFG->{map_shift_x} = $bw + $x - $ox;	99	$::CFG->{map_shift_x} = $bw + $x - $ox;
45	$::CFG->{map_shift_y} = $bh + $y - $oy;	100	$::CFG->{map_shift_y} = $bh + $y - $oy;
46		101
47	$self->update;	102	$self->update;
48	};	103	};
		104	} elsif ($ev->{button} == 3) {
		105	(new CFClient::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);
		131	}
		132
49	}	133	1
50	}	134	}
51		135
52	sub button_up {	136	sub invoke_button_up {
53	my ($self, $ev, $x, $y) = @_;	137	my ($self, $ev, $x, $y) = @_;
54		138
55	delete $self->{motion};	139	delete $self->{motion};
56	}
57		140
		141	1
		142	}
		143
58	sub mouse_motion {	144	sub invoke_mouse_motion {
59	my ($self, $ev, $x, $y) = @_;	145	my ($self, $ev, $x, $y) = @_;
60		146
		147	if ($self->{motion}) {
61	$self->{motion}->($ev, $x, $y) if $self->{motion};	148	$self->{motion}->($ev, $x, $y);
		149	} else {
		150	return 0;
		151	}
		152
		153	1
62	}	154	}
63		155
64	sub size_request {	156	sub size_request {
65	(	157	(
66	1 + 32 * int $::WIDTH / 32,	158	32 * CFClient::ceil $::WIDTH / 32,
67	1 + 32 * int $::HEIGHT / 32,	159	32 * CFClient::ceil $::HEIGHT / 32,
68	)	160	)
69	}	161	}
70		162
71	sub update {	163	sub update {
72	my ($self) = @_;	164	my ($self) = @_;
73		165
74	$self->{need_update} = 1;	166	$self->{need_update} = 1;
75	$self->SUPER::update;	167	$self->SUPER::update;
76	}	168	}
77		169
		170	my %DIR = (
		171	CFClient::SDLK_KP8, [1, "north"],
		172	CFClient::SDLK_KP9, [2, "northeast"],
		173	CFClient::SDLK_KP6, [3, "east"],
		174	CFClient::SDLK_KP3, [4, "southeast"],
		175	CFClient::SDLK_KP2, [5, "south"],
		176	CFClient::SDLK_KP1, [6, "southwest"],
		177	CFClient::SDLK_KP4, [7, "west"],
		178	CFClient::SDLK_KP7, [8, "northwest"],
		179
		180	CFClient::SDLK_UP, [1, "north"],
		181	CFClient::SDLK_RIGHT, [3, "east"],
		182	CFClient::SDLK_DOWN, [5, "south"],
		183	CFClient::SDLK_LEFT, [7, "west"],
		184	);
		185
		186	sub invoke_key_down {
		187	my ($self, $ev) = @_;
		188
		189	my $mod = $ev->{mod};
		190	my $sym = $ev->{sym};
		191	my $uni = $ev->{unicode};
		192
		193	$mod &= CFClient::KMOD_CTRL \| CFClient::KMOD_ALT \| CFClient::KMOD_SHIFT;
		194
		195	if ($uni == ord "\t") {
		196	$::PL_WINDOW->toggle_visibility;
		197	} elsif ($sym == CFClient::SDLK_F1 && !$mod) {
		198	$::HELP_WINDOW->toggle_visibility;
		199	} elsif ($sym == CFClient::SDLK_F2 && !$mod) {
		200	::toggle_player_page ($::STATS_PAGE);
		201	} elsif ($sym == CFClient::SDLK_F3 && !$mod) {
		202	::toggle_player_page ($::SKILL_PAGE);
		203	} elsif ($sym == CFClient::SDLK_F4 && !$mod) {
		204	::toggle_player_page ($::SPELL_PAGE);
		205	} elsif ($sym == CFClient::SDLK_F5 && !$mod) {
		206	::toggle_player_page ($::INVENTORY_PAGE);
		207	} elsif ($sym == CFClient::SDLK_F9 && !$mod) {
		208	$::SETUP_DIALOG->toggle_visibility;
		209	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::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 == CFClient::SDLK_INSERT && not ($mod & CFClient::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 == CFClient::SDLK_KP5 && !$mod) {
		225	$::CONN->user_send ("stay fire");
		226	} elsif ($uni == ord ",") {
		227	$::CONN->user_send ("take");
		228	} elsif ($uni == ord " ") {
		229	$::CONN->user_send ("apply");
		230	} elsif ($uni == ord ".") {
		231	$::CONN->user_send ($self->{completer}{last_command})
		232	if exists $self->{completer}{last_command};
		233	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
		234	$::CONN->user_send ($_) for @$bind_cmd;
		235	} elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
		236	$::CONN->user_send ("rotateshoottype +");
		237	} elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
		238	$::CONN->user_send ("rotateshoottype -");
		239	} elsif ($uni == ord '"') {
		240	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		241	$self->{completer}->show;
		242	} elsif ($uni == ord "'") {
		243	$self->{completer}->set_prefix ("");
		244	$self->{completer}->show;
		245	} elsif (exists $DIR{$sym}) {
		246	if ($mod & CFClient::KMOD_SHIFT) {
		247	$self->{shft}++;
		248	if ($DIR{$sym}[0] != $self->{fire_dir}) {
		249	$::CONN->user_send ("fire $DIR{$sym}[0]");
		250	}
		251	$self->{fire_dir} = $DIR{$sym}[0];
		252	} elsif ($mod & CFClient::KMOD_CTRL) {
		253	$self->{ctrl}++;
		254	$::CONN->user_send ("run $DIR{$sym}[0]");
		255	} else {
		256	$::CONN->user_send ("$DIR{$sym}[1]");
		257	}
		258	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
		259	$self->{completer}->inject_key_down ($ev);
		260	$self->{completer}->show;
		261	} else {
		262	return 0;
		263	}
		264
		265	1
		266	}
		267
		268	sub invoke_key_up {
		269	my ($self, $ev) = @_;
		270
		271	my $res = 0;
		272	my $mod = $ev->{mod};
		273	my $sym = $ev->{sym};
		274
		275	if ($::CFG->{shift_fire_stop}) {
		276	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
		277	$::CONN->user_send ("fire_stop");
		278	delete $self->{fire_dir};
		279	$res = 1;
		280	}
		281	} else {
		282	if (exists $DIR{$sym} && delete $self->{shft}) {
		283	$::CONN->user_send ("fire_stop");
		284	delete $self->{fire_dir};
		285	$res = 1;
		286	} elsif (($sym == CFClient::SDLK_LSHIFT \|\| $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
		287	$::CONN->user_send ("fire_stop");
		288	delete $self->{fire_dir};
		289	$res = 1;
		290	}
		291	}
		292
		293	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
		294	$::CONN->user_send ("run_stop");
		295	$res = 1;
		296	}
		297
		298	$res
		299	}
		300
		301	sub 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
78	sub draw {	312	sub draw {
79	my ($self) = @_;	313	my ($self) = @_;
80		314
		315	return unless $::MAP;
		316
		317	my $focused = $CFClient::UI::FOCUS == $self
		318	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
		319
		320	return
		321	unless $focused \|\| !$::FAST;
		322
81	if (delete $self->{need_update}) {	323	if (delete $self->{need_update}) {
82	glNewList $self->{list}, GL_COMPILE;	324	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
83		325
84	if ($::MAP) {	326	my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
85	my $sw = int $::WIDTH / 32;	327	my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
86	my $sh = int $::HEIGHT / 32;
87		328
88	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	329	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
89	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	330	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
90		331
91	glTranslate $sx0 - 32, $sy0 - 32, 0;	332	my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
		333	my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
92		334
93	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
94
95	if ($::CFG->{fow_enable}) {	335	if ($::CFG->{fow_enable}) {
		336	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
		337
96	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	338	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
97	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	339	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
98	glConvolutionFilter2D (	340	glConvolutionFilter2D (
99	GL_CONVOLUTION_2D,	341	GL_CONVOLUTION_2D,
100	GL_ALPHA,	342	GL_ALPHA,
101	3, 3,	343	3, 3,
102	GL_ALPHA, GL_FLOAT,	344	GL_ALPHA, GL_FLOAT,
103	pack "f*",	345	(pack "f*", @{ $self->{smooth_matrix} }),
104	0.1, 0.1, 0.1,
105	0.1, 0.2, 0.1,
106	0.1, 0.1, 0.1,
107	);	346	);
108	glEnable GL_CONVOLUTION_2D;	347	glEnable GL_CONVOLUTION_2D;
109	}
110
111	$self->{fow_texture} = new CFClient::Texture
112	w => $w,
113	h => $h,
114	data => $data,
115	internalformat => GL_ALPHA,
116	format => GL_ALPHA;
117
118	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
119
120	glEnable GL_BLEND;
121	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
122	glEnable GL_TEXTURE_2D;
123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
124
125	glColor +($::CFG->{fow_intensity}) x 3, 1;
126	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
127
128	glDisable GL_TEXTURE_2D;
129	glDisable GL_BLEND;
130	}	348	}
131		349
132	# HACK BEGIN	350	$self->{fow_texture} = new CFClient::Texture
133	{	351	w => $w,
134	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove	352	h => $h,
135	my ($w, $h) = (250, 250);	353	data => $data,
		354	internalformat => GL_ALPHA,
		355	format => GL_ALPHA;
136		356
137	glEnable GL_BLEND;	357	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
138	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	358	} else {
		359	delete $self->{fow_texture};
		360	}
		361
		362	glNewList $self->{list};
		363
		364	glPushMatrix;
		365	glTranslate $sx0, $sy0;
		366	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		367
		368	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
		369
		370	glScale 32, 32;
		371
		372	if (my $tex = $self->{fow_texture}) {
139	glEnable GL_TEXTURE_2D;	373	glEnable GL_TEXTURE_2D;
140	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	374	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
141		375
142	$self->{mapmap_texture} =	376	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
143	new CFClient::Texture
144	w => $w,
145	h => $h,
146	data => $::MAP->mapmap ($w, $h),
147	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
148
149	$self->{mapmap_texture}->draw_quad (100, 100);	377	$self->{fow_texture}->draw_quad_alpha (0, 0);
150		378
151	glDisable GL_TEXTURE_2D;	379	glDisable GL_TEXTURE_2D;
152	glDisable GL_BLEND;
153	}	380	}
154	# HACK END
155	}
156		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
		393	glPopMatrix;
157	glEndList;	394	glEndList;
158	}	395	}
159		396
160	glPushMatrix;
161	glCallList $self->{list};	397	glCallList $self->{list};
162	glPopMatrix;
163		398
164	if ($CFClient::UI::FOCUS != $self) {	399	# TNT2 emulates logops in software (or worse :)
165	glColor 64/255, 64/255, 64/255;	400	unless ($focused) {
166	glLogicOp GL_AND;	401	glColor 0.4, 0.2, 0.2, 0.6;
167	glEnable GL_COLOR_LOGIC_OP;	402	glEnable GL_BLEND;
		403	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
168	glBegin GL_QUADS;	404	glBegin GL_QUADS;
169	glVertex 0, 0;	405	glVertex 0, 0;
170	glVertex 0, $::HEIGHT;	406	glVertex 0, $::HEIGHT;
171	glVertex $::WIDTH, $::HEIGHT;	407	glVertex $::WIDTH, $::HEIGHT;
172	glVertex $::WIDTH, 0;	408	glVertex $::WIDTH, 0;
173	glEnd;	409	glEnd;
174	glDisable GL_COLOR_LOGIC_OP;	410	glDisable GL_BLEND;
		411	}
		412	}
		413
		414	sub DESTROY {
		415	my $self = shift;
		416
		417	glDeleteList $self->{list};
		418
		419	$self->SUPER::DESTROY;
		420	}
		421
		422	package CFClient::MapWidget::MapMap;
		423
		424	our @ISA = CFClient::UI::Base::;
		425
		426	use Time::HiRes qw(time);
		427	use CFClient::OpenGL;
		428
		429	sub size_request {
		430	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		431	}
		432
		433	sub invoke_size_allocate {
		434	my ($self, $w, $h) = @_;
		435
		436	$self->update;
		437
		438	1
		439	}
		440
		441	sub update {
		442	my ($self) = @_;
		443
		444	delete $self->{texture_atime};
		445	$self->SUPER::update;
		446	}
		447
		448	sub _draw {
		449	my ($self) = @_;
		450
		451	$::MAP or return;
		452
		453	my ($w, $h) = @$self{qw(w h)};
		454
		455	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		456	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		457
		458	my $sx = int $::CFG->{map_shift_x} / 32;
		459	my $sy = int $::CFG->{map_shift_y} / 32;
		460
		461	my $ox = 0.5 * ($w - $sw);
		462	my $oy = 0.5 * ($h - $sh);
		463
		464	glEnable GL_BLEND;
		465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		466	glEnable GL_TEXTURE_2D;
		467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		468
		469	if ($self->{texture_atime} < time) {
		470	$self->{texture_atime} = time + 1/3;
		471
		472	$self->{texture} =
		473	new CFClient::Texture
		474	w => $w,
		475	h => $h,
		476	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		477	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		478	}
		479
		480	$self->{texture}->draw_quad (0, 0);
		481
		482	glDisable GL_TEXTURE_2D;
		483
		484	glTranslate 0.375, 0.375;
		485
		486	#TODO: map scale is completely borked
		487
		488	my $x0 = int $ox - $sx + 0.5;
		489	my $y0 = int $oy - $sy + 0.5;
		490
		491	glColor 1, 1, 0, 1;
		492	glBegin GL_LINE_LOOP;
		493	glVertex $x0 , $y0 ;
		494	glVertex $x0 , $y0 + $sh;
		495	glVertex $x0 + $sw, $y0 + $sh;
		496	glVertex $x0 + $sw, $y0 ;
		497	glEnd;
175	}	498
		499	glDisable GL_BLEND;
176	}	500	}
177		501
178	my %DIR = (	502	package CFClient::MapWidget::Command;
179	SDLK_KP8, [1, "north"],
180	SDLK_KP9, [2, "northeast"],
181	SDLK_KP6, [3, "east"],
182	SDLK_KP3, [4, "southeast"],
183	SDLK_KP2, [5, "south"],
184	SDLK_KP1, [6, "southwest"],
185	SDLK_KP4, [7, "west"],
186	SDLK_KP7, [8, "northwest"],
187		503
188	SDLK_UP, [1, "north"],	504	use strict;
189	SDLK_RIGHT, [3, "east"],
190	SDLK_DOWN, [5, "south"],
191	SDLK_LEFT, [7, "west"],
192	);
193		505
		506	use CFClient::OpenGL;
		507
		508	our @ISA = CFClient::UI::Frame::;
		509
		510	sub new {
		511	my $class = shift;
		512
		513	my $self = $class->SUPER::new (
		514	bg => [0, 0, 0, 0.8],
		515	@_,
		516	);
		517
		518	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		519
		520	$self->{label} = [
		521	map
		522	CFClient::UI::Label->new (
		523	can_hover => 1,
		524	can_events => 1,
		525	tooltip_width => 0.33,
		526	fontsize => $_,
		527	), (0.8) x 16
		528	];
		529
		530	$self->{entry} = new CFClient::UI::Entry
		531	on_changed => sub {
		532	$self->update_labels;
		533	0
		534	},
		535	on_button_down => sub {
		536	my ($entry, $ev, $x, $y) = @_;
		537
		538	if ($ev->{button} == 3) {
		539	(new CFClient::UI::Menu
		540	items => [
		541	["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key"
		542	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
		543	],
		544	)->popup ($ev);
		545	return 1;
		546	}
		547	0
		548	},
		549	on_key_down => sub {
		550	my ($entry, $ev) = @_;
		551
		552	my $self = $entry->{parent}{parent};
		553
		554	if ($ev->{sym} == 13) {
		555	if (exists $self->{select}) {
		556	$self->{last_command} = $self->{select};
		557	$::CONN->user_send ($self->{select});
		558
		559	unshift @{$self->{history}}, $self->{entry}->get_text;
		560	$self->{hist_ptr} = 0;
		561
		562	$self->hide;
		563	}
		564	} elsif ($ev->{sym} == 27) {
		565	$self->{hist_ptr} = 0;
		566	$self->hide;
		567	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		568	if ($self->{hist_ptr} > 1) {
		569	$self->{hist_ptr}--;
		570	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		571	} elsif ($self->{hist_ptr} > 0) {
		572	$self->{hist_ptr}--;
		573	$self->{entry}->set_text ($self->{hist_saveback});
		574	} else {
		575	++$self->{select_offset}
		576	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		577	}
		578	$self->update_labels;
		579	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		580	if ($self->{select_offset}) {
		581	--$self->{select_offset}
		582	} else {
		583	unless ($self->{hist_ptr}) {
		584	$self->{hist_saveback} = $self->{entry}->get_text;
		585	}
		586	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		587	$self->{hist_ptr}++;
		588	}
		589	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		590	if exists $self->{history}->[$self->{hist_ptr} - 1];
		591	}
		592	$self->update_labels;
		593	} else {
		594	return 0;
		595	}
		596
		597	1
		598	}
		599	;
		600
		601	$self->{vbox}->add (
		602	$self->{entry},
		603	@{$self->{label}},
		604	);
		605
		606	$self
		607	}
		608
		609	sub set_prefix {
		610	my ($self, $prefix) = @_;
		611
		612	$self->{entry}->set_text ($prefix);
		613	$self->show;
		614	}
		615
		616	sub invoke_size_allocate {
		617	my ($self, $w, $h) = @_;
		618
		619	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		620
		621	$self->SUPER::invoke_size_allocate ($w, $h)
		622	}
		623
		624	sub show {
		625	my ($self) = @_;
		626
		627	$self->SUPER::show;
		628	$self->{entry}->grab_focus;
		629	}
		630
		631	sub hide {
		632	my ($self) = @_;
		633
		634	$self->{hist_ptr} = 0;
		635
		636	$self->SUPER::hide;
		637	$self->{entry}->set_text ("");
		638	}
		639
194	sub key_down {	640	sub inject_key_down {
195	my ($self, $ev) = @_;	641	my ($self, $ev) = @_;
196		642
197	my $mod = $ev->key_mod;	643	$self->{entry}->grab_focus;
198	my $sym = $ev->key_sym;	644	$self->{entry}->emit (key_down => $ev);
		645	}
199		646
200	if ($sym == SDLK_KP5) {	647	sub update_labels {
201	$::CONN->user_send ("stay fire");	648	my ($self) = @_;
202	} elsif ($sym == SDLK_a) {	649
203	$::CONN->user_send ("apply");	650	my $text = $self->{entry}->get_text;
204	} elsif ($sym == SDLK_QUOTE) {	651
205	$self->emit ('activate_console');	652	length $text
206	} elsif ($sym == SDLK_SLASH) {	653	or return $self->hide;
207	$self->emit ('activate_console' => '/');	654
208	} elsif (exists $DIR{$sym}) {	655	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
209	if ($mod & KMOD_SHIFT) {	656
210	$self->{shft}++;	657	if ($text ne $self->{last_search}) {
211	$::CONN->user_send ("fire $DIR{$sym}[0]");	658	my @match;
212	} elsif ($mod & KMOD_CTRL) {	659
213	$self->{ctrl}++;	660	if ($text =~ /^(.*?)\s+$/) {
214	$::CONN->user_send ("run $DIR{$sym}[0]");	661	@match = [$cmd, "(appended whitespace suppresses completion)"];
215	} else {	662	} else {
216	$::CONN->user_send ("$DIR{$sym}[1]");	663	my $regexp = do {
		664	my ($beg, @chr) = split //, lc $cmd;
		665
		666	# the following regex is used to match our "completion entry"
		667	# to an actual command - the parentheses match kind of "overhead"
		668	# - the more characters the parentheses match, the less attractive
		669	# is the match.
		670	my $regexp = "^\Q$beg\E"
		671	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		672	qr<$regexp>
		673	};
		674
		675	my @penalty;
		676
		677	for (keys %{$self->{command}}) {
		678	if (@penalty = $_ =~ $regexp) {
		679	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		680	}
217	}	681	}
218	}
219	}
220		682
221	sub key_up {	683	@match = map $self->{command}{$_->[0]},
		684	sort {
		685	$a->[1] <=> $b->[1]
		686	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		687	or (length $b->[0]) <=> (length $a->[0])
		688	} @match;
		689	}
		690
		691	$self->{last_search} = $text;
		692	$self->{last_match} = \@match;
		693
		694	$self->{select_offset} = 0;
		695	}
		696
		697	my @labels = @{ $self->{label} };
		698	my @matches = @{ $self->{last_match} \|\| [] };
		699
		700	if ($self->{select_offset}) {
		701	splice @matches, 0, $self->{select_offset}, ();
		702
		703	my $label = shift @labels;
		704	$label->set_text ("...");
		705	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		706	}
		707
		708	for my $label (@labels) {
		709	$label->{fg} = [1, 1, 1, 1];
		710	$label->{bg} = [0, 0, 0, 0];
		711	}
		712
		713	if (@matches) {
		714	$self->{select} = "$matches[0][0]$arg";
		715
		716	$labels[0]->{fg} = [0, 0, 0, 1];
		717	$labels[0]->{bg} = [1, 1, 1, 0.8];
		718	} else {
		719	$self->{select} = "$cmd$arg";
		720	}
		721
		722	for my $match (@matches) {
		723	my $label = shift @labels;
		724
		725	if (@labels) {
		726	$label->set_text ("$match->[0]$arg");
		727	$label->set_tooltip ($match->[1]);
		728	} else {
		729	$label->set_text ("...");
		730	$label->set_tooltip ("Use Cursor-Down to view more matches");
		731	last;
		732	}
		733	}
		734
		735	for my $label (@labels) {
		736	$label->set_text ("");
		737	$label->set_tooltip ("");
		738	}
		739
		740	$self->update;
		741	}
		742
		743	sub _draw {
222	my ($self, $ev) = @_;	744	my ($self) = @_;
223		745
224	my $mod = $ev->key_mod;	746	# hack
225	my $sym = $ev->key_sym;	747	local $CFClient::UI::FOCUS = $self->{entry};
226		748
227	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	749	$self->SUPER::_draw;
228	$::CONN->user_send ("fire_stop");
229	}
230	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
231	$::CONN->user_send ("run_stop");
232	}
233	}
234
235	sub add_command {
236	my ($self, $command, $widget, $cb) = @_;
237
238	(my $abbrev = $command) =~ s/(\S)[^[:space:]_][[:space:]_]/$1/g;
239	warn "$command\|$abbrev\|$widget\n";#d#
240	}	750	}
241		751
242	1	752	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs. Revision 1.79 by elmex, Mon Jul 24 12:25:09 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs.
Revision 1.79 by elmex, Mon Jul 24 12:25:09 2006 UTC