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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.48 by elmex, Sat Jun 3 21:59:55 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.48 by elmex, Sat Jun 3 21:59:55 2006 UTC