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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.7 by root, Thu Apr 20 21:28:50 2006 UTC vs. Revision 1.46 by elmex, Fri Jun 2 09:02:49 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.7 by root, Thu Apr 20 21:28:50 2006 UTC vs.
Revision 1.46 by elmex, Fri Jun 2 09:02:49 2006 UTC