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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.8 by root, Sat Apr 22 21:47:45 2006 UTC vs. Revision 1.66 by root, Sun Jun 18 19:13:20 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.8 by root, Sat Apr 22 21:47:45 2006 UTC vs.
Revision 1.66 by root, Sun Jun 18 19:13:20 2006 UTC