[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.24 by root, Wed May 17 10:14:52 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	$self
21	}	23	}
22		24
23	sub DESTROY {	25	sub DESTROY {
24	my $self = shift;	26	my $self = shift;
25		27
…		…
84		86
85	if ($::MAP) {	87	if ($::MAP) {
86	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	88	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
87	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	89	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
88		90
		91	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;
		93
89	glPushMatrix;	94	glPushMatrix;
90	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	95	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		96
95	glTranslate $sx0 - 32, $sy0 - 32, 0;	97	glTranslate $sx0 - 32, $sy0 - 32, 0;
96		98
97	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	99	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
98		100
…		…
131		133
132	glDisable GL_TEXTURE_2D;	134	glDisable GL_TEXTURE_2D;
133	glDisable GL_BLEND;	135	glDisable GL_BLEND;
134	}	136	}
135		137
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;	138	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	}	139	}
177		140
178	glEndList;	141	glEndList;
179	}	142	}
180		143
…		…
213	);	176	);
214		177
215	sub key_down {	178	sub key_down {
216	my ($self, $ev) = @_;	179	my ($self, $ev) = @_;
217		180
		181	return unless $::CONN;
		182
218	my $mod = $ev->{mod};	183	my $mod = $ev->{mod};
219	my $sym = $ev->{sym};	184	my $sym = $ev->{sym};
		185	my $uni = $ev->{unicode};
220		186
221	if ($sym == CFClient::SDLK_KP5) {	187	if ($sym == CFClient::SDLK_KP5) {
222	$::CONN->user_send ("stay fire");	188	$::CONN->user_send ("stay fire");
223	} elsif ($sym == ord ",") {	189	} elsif ($uni == ord ",") {
224	$::CONN->user_send ("take");	190	$::CONN->user_send ("take");
225	} elsif ($sym == ord "a") {	191	} elsif ($uni == ord "\t") {
226	$::CONN->user_send ("apply");	192	$::CONN->user_send ("apply");
227	} elsif ($sym == ord "'") {	193	} elsif ($uni == ord "'") {
228	$self->emit ('activate_console');	194	$self->emit ('activate_console');
229	} elsif ($sym == ord "/") {	195	} elsif ($uni == ord "/") {
230	$self->emit (activate_console => '/');	196	$self->emit (activate_console => '/');
231	} elsif (exists $DIR{$sym}) {	197	} elsif (exists $DIR{$sym}) {
232	if ($mod & CFClient::KMOD_SHIFT) {	198	if ($mod & CFClient::KMOD_SHIFT) {
233	$self->{shft}++;	199	$self->{shft}++;
234	$::CONN->user_send ("fire $DIR{$sym}[0]");	200	$::CONN->user_send ("fire $DIR{$sym}[0]");
…		…
243	new CFClient::MapWidget::Command::	209	new CFClient::MapWidget::Command::
244	command => $self->{command},	210	command => $self->{command},
245	can_focus => 1,	211	can_focus => 1,
246	connect_execute => sub {	212	connect_execute => sub {
247	# todo: support callback instead of user_send	213	# todo: support callback instead of user_send
248	$::CONN->user_send ($_[1][1]);	214	$::CONN->user_send ($_[1]);
249	},	215	},
250	connect_close => sub {	216	connect_close => sub {
251	(delete $self->{command_widget})->hide;	217	(delete $self->{command_widget})->hide;
252	$self->focus_in;	218	$self->focus_in;
253	},	219	},
254	;	220	;
255	$self->{command_widget}->key_down ($ev);	221	$self->{command_widget}->key_down ($ev)
		222	unless $ev->{unicode} == 20;
256	return unless $self->{command_widget};	223	return unless $self->{command_widget};
257	$self->{command_widget}->show;	224	$self->{command_widget}->show;
258	$self->{command_widget}->focus_in;	225	$self->{command_widget}->focus_in;
259	}	226	}
260	}	227	}
…		…
274	}	241	}
275		242
276	sub add_command {	243	sub add_command {
277	my ($self, $command, $tooltip, $widget, $cb) = @_;	244	my ($self, $command, $tooltip, $widget, $cb) = @_;
278		245
279	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;	246	(my $data = $command) =~ s/\\//g;
280		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
281	push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];	255	$self->{command}{$command} = [$data, $tooltip, $widget, $cb];
		256	}
		257
		258	sub clr_commands {
		259	my ($self) = @_;
		260
		261	%{$self->{command}} = ();
		262	}
		263
		264	package CFClient::MapWidget::MapMap;
		265
		266	our @ISA = CFClient::UI::Base::;
		267
		268	use Time::HiRes qw(time);
		269	use CFClient::OpenGL;
		270
		271	sub size_request {
		272	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		273	}
		274
		275	sub size_allocate {
		276	my ($self, $w, $h) = @_;
		277
		278	$self->SUPER::size_allocate ($w, $h);
		279	$self->update;
		280	}
		281
		282	sub update {
		283	my ($self) = @_;
		284
		285	delete $self->{texture_atime};
		286	$self->SUPER::update;
		287	}
		288
		289	sub _draw {
		290	my ($self) = @_;
		291
		292	$::MAP or return;
		293
		294	my ($w, $h) = @$self{qw(w h)};
		295
		296	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		297	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		298
		299	my $sx = int $::CFG->{map_shift_x} / 32;
		300	my $sy = int $::CFG->{map_shift_y} / 32;
		301
		302	my $ox = 0.5 * ($w - $sw);
		303	my $oy = 0.5 * ($h - $sh);
		304
		305	glEnable GL_BLEND;
		306	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		307	glEnable GL_TEXTURE_2D;
		308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		309
		310	if ($self->{texture_atime} < time) {
		311	$self->{texture_atime} = time + 1/3;
		312
		313	$self->{texture} =
		314	new CFClient::Texture
		315	w => $w,
		316	h => $h,
		317	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		318	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		319	}
		320
		321	$self->{texture}->draw_quad (0, 0);
		322
		323	glDisable GL_TEXTURE_2D;
		324
		325	glTranslate 0.375, 0.375;
		326
		327	#TODO: map scale is completely borked
		328
		329	my $x0 = int $ox - $sx + 0.5;
		330	my $y0 = int $oy - $sy + 0.5;
		331
		332	glColor 1, 1, 0, 1;
		333	glBegin GL_LINE_LOOP;
		334	glVertex $x0 , $y0 ;
		335	glVertex $x0 , $y0 + $sh;
		336	glVertex $x0 + $sw, $y0 + $sh;
		337	glVertex $x0 + $sw, $y0 ;
		338	glEnd;
		339
		340	glDisable GL_BLEND;
282	}	341	}
283		342
284	package CFClient::MapWidget::Command;	343	package CFClient::MapWidget::Command;
285		344
286	use strict;	345	use strict;
287		346
288	use CFClient::OpenGL;	347	use CFClient::OpenGL;
289		348
290	our @ISA = CFClient::UI::VBox::;	349	our @ISA = CFClient::UI::Frame::;
291		350
292	sub new {	351	sub new {
293	my $class = shift;	352	my $class = shift;
294		353
295	my $self = $class->SUPER::new (	354	my $self = $class->SUPER::new (
		355	bg => [0, 0, 0, 0.8],
296	@_,	356	@_,
297	children => [map	357	);
		358
		359	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		360
		361	$self->{label} = [
		362	map
298	CFClient::UI::Label->new (	363	CFClient::UI::Label->new (
299	can_hover => 1,	364	can_hover => 1,
300	can_events => 1,	365	can_events => 1,
301	fontsize => $_,	366	fontsize => $_,
302	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8	367	), (0.8) x 6
		368	];
		369
		370	$self->{entry} = new CFClient::UI::Entry
		371	connect_changed => sub {
		372	$self->update_labels;
303	],	373	};
		374
		375	$self->{vbox}->add (
		376	$self->{entry},
		377	@{$self->{label}},
304	);	378	);
305		379
306	$self	380	$self
307	}	381	}
308		382
…		…
311		385
312	$self->SUPER::size_allocate ($w, $h);	386	$self->SUPER::size_allocate ($w, $h);
313	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	387	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
314	}	388	}
315		389
316	sub update_labels {
317	my ($self) = @_;
318
319	my $command = $self->{command};
320	my $search_abbrev = qr/^\Q$self->{search}/;
321	my $search_full = qr/\Q$self->{search}/;
322
323	my @found;
324
325	for (@$command) {
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 ("...");
347	}
348
349	$self->check_size;
350	}
351
352	sub key_down {	390	sub key_down {
353	my ($self, $ev) = @_;	391	my ($self, $ev) = @_;
354		392
355	if ($ev->{sym} == 8) {	393	if ($ev->{sym} == 13) {
356	substr $self->{search}, -1, 1, "";
357	$self->update_labels;
358	} elsif ($ev->{sym} == 13) {
359	if (exists $self->{select}) {	394	if (exists $self->{select}) {
360	$self->emit (execute => $self->{select});	395	$self->emit (execute => $self->{select});
361	$self->emit ("close");	396	$self->emit ("close");
362	}	397	}
363	} elsif ($ev->{sym} == 27) {	398	} elsif ($ev->{sym} == 27) {
		399	$self->{entry}->set_text ("");
364	$self->emit ("close");	400	$self->emit ("close");
365	return;	401	return;
366	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {	402	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
367	$self->{search} .= chr $ev->{unicode};	403	++$self->{select_offset}
		404	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
368	$self->update_labels;	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);
369	}	413	}
		414	}
370		415
371	length $self->{search}	416	sub update_labels {
		417	my ($self) = @_;
		418
		419	my $text = $self->{entry}->get_text;
		420
		421	length $text
372	or $self->emit ("close");	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;
		455	$self->{last_match} = \@match;
		456
		457	$self->{select_offset} = 0;
		458	}
		459
		460	my @labels = @{ $self->{label} };
		461	my @matches = @{ $self->{last_match} \|\| [] };
		462
		463	if ($self->{select_offset}) {
		464	splice @matches, 0, $self->{select_offset}, ();
		465
		466	my $label = shift @labels;
		467	$label->set_text ("...");
		468	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		469	}
		470
		471	for my $label (@labels) {
		472	$label->{fg} = [1, 1, 1, 1];
		473	$label->{bg} = [0, 0, 0, 0];
		474	}
		475
		476	if (@matches) {
		477	$self->{select} = "$matches[0][0]$arg";
		478
		479	$labels[0]->{fg} = [0, 0, 0, 1];
		480	$labels[0]->{bg} = [1, 1, 1, 0.8];
		481	} else {
		482	$self->{select} = "$cmd$arg";
		483	}
		484
		485	for my $match (@matches) {
		486	my $label = shift @labels;
		487
		488	if (@labels) {
		489	$label->set_text ("$match->[0]$arg");
		490	$label->set_tooltip ($match->[1]);
		491	} else {
		492	$label->set_text ("...");
		493	$label->set_tooltip ("Use Cursor-Down to view more matches");
		494	last;
		495	}
		496	}
		497
		498	for my $label (@labels) {
		499	$label->set_text ("");
		500	$label->set_tooltip ("");
		501	}
		502
		503	$self->update;
		504	###
		505	}
		506
		507	sub _draw {
		508	my ($self) = @_;
		509
		510	# hack
		511	local $CFClient::UI::FOCUS = $self->{entry};
		512
		513	$self->SUPER::_draw;
373	}	514	}
374		515
375	1	516	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.24 by root, Wed May 17 10:14:52 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.24 by root, Wed May 17 10:14:52 2006 UTC