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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.23 by root, Wed May 17 00:26:55 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.23 by root, Wed May 17 00:26:55 2006 UTC vs. Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.23 by root, Wed May 17 00:26:55 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC