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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs. Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC