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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.15 by root, Mon Apr 24 13:01:13 2006 UTC vs. Revision 1.42 by root, Mon May 29 18:33:23 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.15 by root, Mon Apr 24 13:01:13 2006 UTC vs.
Revision 1.42 by root, Mon May 29 18:33:23 2006 UTC