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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.16 by root, Mon Apr 24 13:04:31 2006 UTC vs.
Revision 1.27 by root, Wed May 17 20:21:27 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
…		…
77	}	79	}
78		80
79	sub draw {	81	sub draw {
80	my ($self) = @_;	82	my ($self) = @_;
81		83
		84	return
		85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;
		86
82	if (delete $self->{need_update}) {	87	if (delete $self->{need_update}) {
83	glNewList $self->{list};	88	glNewList $self->{list};
84		89
85	if ($::MAP) {	90	if ($::MAP) {
86	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale});	91	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
87	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});	92	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		93
		94	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		95	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
88		96
89	glPushMatrix;	97	glPushMatrix;
90	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	98	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		99
95	glTranslate $sx0 - 32, $sy0 - 32, 0;	100	glTranslate $sx0 - 32, $sy0 - 32, 0;
96		101
97	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
98		103
…		…
131		136
132	glDisable GL_TEXTURE_2D;	137	glDisable GL_TEXTURE_2D;
133	glDisable GL_BLEND;	138	glDisable GL_BLEND;
134	}	139	}
135		140
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;	141	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	}	142	}
177		143
178	glEndList;	144	glEndList;
179	}	145	}
180		146
…		…
213	);	179	);
214		180
215	sub key_down {	181	sub key_down {
216	my ($self, $ev) = @_;	182	my ($self, $ev) = @_;
217		183
		184	return unless $::CONN;
		185
218	my $mod = $ev->{mod};	186	my $mod = $ev->{mod};
219	my $sym = $ev->{sym};	187	my $sym = $ev->{sym};
		188	my $uni = $ev->{unicode};
220		189
221	if ($sym == CFClient::SDLK_KP5) {	190	if ($sym == CFClient::SDLK_KP5) {
222	$::CONN->user_send ("stay fire");	191	$::CONN->user_send ("stay fire");
223	} elsif ($sym == ord ",") {	192	} elsif ($uni == ord ",") {
224	$::CONN->user_send ("take");	193	$::CONN->user_send ("take");
225	} elsif ($sym == ord "a") {	194	} elsif ($uni == ord "\t") {
226	$::CONN->user_send ("apply");	195	$::CONN->user_send ("apply");
		196	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
		197	$::CONN->user_send ("rotateshoottype +");
		198	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
		199	$::CONN->user_send ("rotateshoottype -");
227	} elsif ($sym == ord "'") {	200	} elsif ($uni == ord "'") {
228	$self->emit ('activate_console');	201	$self->emit ('activate_console');
229	} elsif ($sym == ord "/") {	202	} elsif ($uni == ord "/") {
230	$self->emit (activate_console => '/');	203	$self->emit (activate_console => '/');
231	} elsif (exists $DIR{$sym}) {	204	} elsif (exists $DIR{$sym}) {
232	if ($mod & CFClient::KMOD_SHIFT) {	205	if ($mod & CFClient::KMOD_SHIFT) {
233	$self->{shft}++;	206	$self->{shft}++;
234	$::CONN->user_send ("fire $DIR{$sym}[0]");	207	$::CONN->user_send ("fire $DIR{$sym}[0]");
…		…
243	new CFClient::MapWidget::Command::	216	new CFClient::MapWidget::Command::
244	command => $self->{command},	217	command => $self->{command},
245	can_focus => 1,	218	can_focus => 1,
246	connect_execute => sub {	219	connect_execute => sub {
247	# todo: support callback instead of user_send	220	# todo: support callback instead of user_send
248	$::CONN->user_send ($_[1][1]);	221	$::CONN->user_send ($_[1]);
249	},	222	},
250	connect_close => sub {	223	connect_close => sub {
251	(delete $self->{command_widget})->hide;	224	(delete $self->{command_widget})->hide;
252	$self->focus_in;	225	$self->focus_in;
253	},	226	},
254	;	227	;
255	$self->{command_widget}->key_down ($ev);	228	$self->{command_widget}->key_down ($ev)
		229	unless $ev->{unicode} == 20;
256	return unless $self->{command_widget};	230	return unless $self->{command_widget};
257	$self->{command_widget}->show;	231	$self->{command_widget}->show;
258	$self->{command_widget}->focus_in;	232	$self->{command_widget}->focus_in;
259	}	233	}
260	}	234	}
…		…
274	}	248	}
275		249
276	sub add_command {	250	sub add_command {
277	my ($self, $command, $tooltip, $widget, $cb) = @_;	251	my ($self, $command, $tooltip, $widget, $cb) = @_;
278		252
279	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;	253	(my $data = $command) =~ s/\\//g;
280		254
281	push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];	255	$tooltip =~ s/^\s+//;
		256
		257	$tooltip = "<big>$data</big>\n\n$tooltip";
		258
		259	$tooltip =~ s/\s+$//;
		260
		261	$self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		262	}
		263
		264	sub clr_commands {
		265	my ($self) = @_;
		266
		267	%{$self->{command}} = ();
		268	}
		269
		270	package CFClient::MapWidget::MapMap;
		271
		272	our @ISA = CFClient::UI::Base::;
		273
		274	use Time::HiRes qw(time);
		275	use CFClient::OpenGL;
		276
		277	sub size_request {
		278	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		279	}
		280
		281	sub size_allocate {
		282	my ($self, $w, $h) = @_;
		283
		284	$self->SUPER::size_allocate ($w, $h);
		285	$self->update;
		286	}
		287
		288	sub update {
		289	my ($self) = @_;
		290
		291	delete $self->{texture_atime};
		292	$self->SUPER::update;
		293	}
		294
		295	sub _draw {
		296	my ($self) = @_;
		297
		298	$::MAP or return;
		299
		300	my ($w, $h) = @$self{qw(w h)};
		301
		302	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		303	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		304
		305	my $sx = int $::CFG->{map_shift_x} / 32;
		306	my $sy = int $::CFG->{map_shift_y} / 32;
		307
		308	my $ox = 0.5 * ($w - $sw);
		309	my $oy = 0.5 * ($h - $sh);
		310
		311	glEnable GL_BLEND;
		312	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		313	glEnable GL_TEXTURE_2D;
		314	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		315
		316	if ($self->{texture_atime} < time) {
		317	$self->{texture_atime} = time + 1/3;
		318
		319	$self->{texture} =
		320	new CFClient::Texture
		321	w => $w,
		322	h => $h,
		323	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		324	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		325	}
		326
		327	$self->{texture}->draw_quad (0, 0);
		328
		329	glDisable GL_TEXTURE_2D;
		330
		331	glTranslate 0.375, 0.375;
		332
		333	#TODO: map scale is completely borked
		334
		335	my $x0 = int $ox - $sx + 0.5;
		336	my $y0 = int $oy - $sy + 0.5;
		337
		338	glColor 1, 1, 0, 1;
		339	glBegin GL_LINE_LOOP;
		340	glVertex $x0 , $y0 ;
		341	glVertex $x0 , $y0 + $sh;
		342	glVertex $x0 + $sw, $y0 + $sh;
		343	glVertex $x0 + $sw, $y0 ;
		344	glEnd;
		345
		346	glDisable GL_BLEND;
282	}	347	}
283		348
284	package CFClient::MapWidget::Command;	349	package CFClient::MapWidget::Command;
285		350
286	use strict;	351	use strict;
287		352
288	use CFClient::OpenGL;	353	use CFClient::OpenGL;
289		354
290	our @ISA = CFClient::UI::VBox::;	355	our @ISA = CFClient::UI::Frame::;
291		356
292	sub new {	357	sub new {
293	my $class = shift;	358	my $class = shift;
294		359
295	my $self = $class->SUPER::new (	360	my $self = $class->SUPER::new (
		361	bg => [0, 0, 0, 0.8],
296	@_,	362	@_,
297	children => [map	363	);
		364
		365	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		366
		367	$self->{label} = [
		368	map
298	CFClient::UI::Label->new (	369	CFClient::UI::Label->new (
299	can_hover => 1,	370	can_hover => 1,
300	can_events => 1,	371	can_events => 1,
		372	tooltip_width => 0.33,
301	fontsize => $_,	373	fontsize => $_,
302	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8	374	), (0.8) x 16
		375	];
		376
		377	$self->{entry} = new CFClient::UI::Entry
		378	connect_changed => sub {
		379	$self->update_labels;
303	],	380	};
		381
		382	$self->{vbox}->add (
		383	$self->{entry},
		384	@{$self->{label}},
304	);	385	);
305		386
306	$self	387	$self
307	}	388	}
308		389
…		…
311		392
312	$self->SUPER::size_allocate ($w, $h);	393	$self->SUPER::size_allocate ($w, $h);
313	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	394	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
314	}	395	}
315		396
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 {	397	sub key_down {
353	my ($self, $ev) = @_;	398	my ($self, $ev) = @_;
354		399
355	if ($ev->{sym} == 8) {	400	if ($ev->{sym} == 13) {
356	substr $self->{search}, -1, 1, "";
357	$self->update_labels;
358	} elsif ($ev->{sym} == 13) {
359	if (exists $self->{select}) {	401	if (exists $self->{select}) {
360	$self->emit (execute => $self->{select});	402	$self->emit (execute => $self->{select});
361	$self->emit ("close");	403	$self->emit ("close");
362	}	404	}
363	} elsif ($ev->{sym} == 27) {	405	} elsif ($ev->{sym} == 27) {
		406	$self->{entry}->set_text ("");
364	$self->emit ("close");	407	$self->emit ("close");
365	return;	408	return;
366	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {	409	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
367	$self->{search} .= chr $ev->{unicode};	410	++$self->{select_offset}
		411	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
368	$self->update_labels;	412	$self->update_labels;
		413	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		414	--$self->{select_offset}
		415	if $self->{select_offset};
		416	$self->update_labels;
		417	} else {
		418	#$self->{entry}{force_alloc} = 1;
		419	$self->{entry}->key_down ($ev);
369	}	420	}
		421	}
370		422
371	length $self->{search}	423	sub update_labels {
		424	my ($self) = @_;
		425
		426	my $text = $self->{entry}->get_text;
		427
		428	length $text
372	or $self->emit ("close");	429	or return $self->emit ("close");
		430
		431	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		432
		433	if ($cmd ne $self->{last_search}) {
		434	my $regexp = do {
		435	my ($beg, @chr) = split //, lc $cmd;
		436
		437	# the following regex is used to match our "completion entry"
		438	# to an actual command - the parentheses match kind of "overhead"
		439	# - the more characters the parentheses match, the less attractive
		440	# is the match.
		441	my $regexp = "^\Q$beg\E"
		442	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		443	qr<$regexp>
		444	};
		445
		446	my @match;
		447	my @penalty;
		448
		449	for (keys %{$self->{command}}) {
		450	if (@penalty = $_ =~ $regexp) {
		451	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		452	}
		453	}
		454
		455	@match = map $self->{command}{$_->[0]},
		456	sort {
		457	$a->[1] <=> $b->[1]
		458	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		459	} @match;
		460
		461	$self->{last_search} = $cmd;
		462	$self->{last_match} = \@match;
		463
		464	$self->{select_offset} = 0;
		465	}
		466
		467	my @labels = @{ $self->{label} };
		468	my @matches = @{ $self->{last_match} \|\| [] };
		469
		470	if ($self->{select_offset}) {
		471	splice @matches, 0, $self->{select_offset}, ();
		472
		473	my $label = shift @labels;
		474	$label->set_text ("...");
		475	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		476	}
		477
		478	for my $label (@labels) {
		479	$label->{fg} = [1, 1, 1, 1];
		480	$label->{bg} = [0, 0, 0, 0];
		481	}
		482
		483	if (@matches) {
		484	$self->{select} = "$matches[0][0]$arg";
		485
		486	$labels[0]->{fg} = [0, 0, 0, 1];
		487	$labels[0]->{bg} = [1, 1, 1, 0.8];
		488	} else {
		489	$self->{select} = "$cmd$arg";
		490	}
		491
		492	for my $match (@matches) {
		493	my $label = shift @labels;
		494
		495	if (@labels) {
		496	$label->set_text ("$match->[0]$arg");
		497	$label->set_tooltip ($match->[1]);
		498	} else {
		499	$label->set_text ("...");
		500	$label->set_tooltip ("Use Cursor-Down to view more matches");
		501	last;
		502	}
		503	}
		504
		505	for my $label (@labels) {
		506	$label->set_text ("");
		507	$label->set_tooltip ("");
		508	}
		509
		510	$self->update;
		511	###
		512	}
		513
		514	sub _draw {
		515	my ($self) = @_;
		516
		517	# hack
		518	local $CFClient::UI::FOCUS = $self->{entry};
		519
		520	$self->SUPER::_draw;
373	}	521	}
374		522
375	1	523	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.16 by root, Mon Apr 24 13:04:31 2006 UTC vs. Revision 1.27 by root, Wed May 17 20:21:27 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.16 by root, Mon Apr 24 13:04:31 2006 UTC vs.
Revision 1.27 by root, Wed May 17 20:21:27 2006 UTC