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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC

…		…
14		14
15	my $self = $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
		20	smooth_matrix => [
		21	0.05, 0.13, 0.05,
		22	0.13, 0.30, 0.13,
		23	0.05, 0.13, 0.05,
		24	],
		25
19	@_	26	@_
20	);	27	);
21		28
22	$self->{completer} = new CFClient::MapWidget::Command::	29	$self->{completer} = new CFClient::MapWidget::Command::
23	command => $self->{command},	30	command => $self->{command},
…		…
54	}	61	}
55		62
56	sub button_down {	63	sub button_down {
57	my ($self, $ev, $x, $y) = @_;	64	my ($self, $ev, $x, $y) = @_;
58		65
		66	return unless $::CONN;
		67
59	$self->focus_in;	68	$self->focus_in;
60		69
61	if ($ev->{button} == 1) {	70	if ($ev->{button} == 1) {
62	my ($ox, $oy) = ($ev->{x}, $ev->{y});
63
64	my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99);	71	my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});
65	my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99);	72	my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});
66	$fx += $::MAP->x;	73
67	$fy += $::MAP->y;	74	$x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
		75	$y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
68		76
69	$::CONN->send (sprintf "lookat %d %d", $fx, $fy);	77	$x -= int 0.5 * $::MAP->w;
		78	$y -= int 0.5 * $::MAP->h;
70		79
71	warn "FOOX: $fx (".$::MAP->ox.")\n";	80	$x += 1;
72	warn "FOOY: $fy (".$::MAP->oy.")\n";	81	$y += 1;
		82
		83	$::CONN->lookat ($x, $y)
		84	if $::CONN;
		85
73	} elsif ($ev->{button} == 2) {	86	} elsif ($ev->{button} == 2) {
74	my ($ox, $oy) = ($ev->{x}, $ev->{y});	87	my ($ox, $oy) = ($ev->{x}, $ev->{y});
75	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	88	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
76		89
77	$self->{motion} = sub {	90	$self->{motion} = sub {
…		…
170	$self->{completer}->set_prefix ("");	183	$self->{completer}->set_prefix ("");
171	$self->{completer}->show;	184	$self->{completer}->show;
172	} elsif (exists $DIR{$sym}) {	185	} elsif (exists $DIR{$sym}) {
173	if ($mod & CFClient::KMOD_SHIFT) {	186	if ($mod & CFClient::KMOD_SHIFT) {
174	$self->{shft}++;	187	$self->{shft}++;
		188	if ($DIR{$sym}[0] != $self->{fire_dir}) {
175	$::CONN->user_send ("fire $DIR{$sym}[0]");	189	$::CONN->user_send ("fire $DIR{$sym}[0]");
		190	}
		191	$self->{fire_dir} = $DIR{$sym}[0];
176	} elsif ($mod & CFClient::KMOD_CTRL) {	192	} elsif ($mod & CFClient::KMOD_CTRL) {
177	$self->{ctrl}++;	193	$self->{ctrl}++;
178	$::CONN->user_send ("run $DIR{$sym}[0]");	194	$::CONN->user_send ("run $DIR{$sym}[0]");
179	} else {	195	} else {
180	$::CONN->user_send ("$DIR{$sym}[1]");	196	$::CONN->user_send ("$DIR{$sym}[1]");
…		…
208		224
209	my $res = 0;	225	my $res = 0;
210	my $mod = $ev->{mod};	226	my $mod = $ev->{mod};
211	my $sym = $ev->{sym};	227	my $sym = $ev->{sym};
212		228
		229	if ($::CFG->{shift_fire_stop}) {
213	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	230	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
214	$::CONN->user_send ("fire_stop");	231	$::CONN->user_send ("fire_stop");
		232	delete $self->{fire_dir};
215	$res = 1;	233	$res = 1;
		234	}
		235	} else {
		236	if (exists $DIR{$sym} && delete $self->{shft}) {
		237	$::CONN->user_send ("fire_stop");
		238	delete $self->{fire_dir};
		239	$res = 1;
		240	} elsif (($sym == CFClient::SDLK_LSHIFT \|\| $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
		241	$::CONN->user_send ("fire_stop");
		242	delete $self->{fire_dir};
		243	$res = 1;
		244	}
216	}	245	}
217		246
218	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	247	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
219	$::CONN->user_send ("run_stop");	248	$::CONN->user_send ("run_stop");
220	$res = 1;	249	$res = 1;
…		…
228		257
229	my $focused = $CFClient::UI::FOCUS == $self	258	my $focused = $CFClient::UI::FOCUS == $self
230	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};	259	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
231		260
232	return	261	return
233	unless $focused \|\| !$::FAST;	262	unless $::CONN && ($focused \|\| !$::FAST);
234		263
235	if (delete $self->{need_update}) {	264	if (delete $self->{need_update}) {
		265	$self->{fow_texture} \|\|= glGenTexture;
		266
236	glNewList $self->{list};	267	glNewList $self->{list};
237		268
238	if ($::MAP) {	269	if ($::MAP) {
239	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	270	my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
240	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	271	my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
241		272
242	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	273	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
243	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	274	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
		275	my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
		276	my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
244		277
245	glPushMatrix;	278	glPushMatrix;
246	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	279	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
247		280
248	glTranslate $sx0 - 32, $sy0 - 32, 0;	281	glTranslate $sx0, $sy0;
249		282
250	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	283	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
251		284
252	if ($::CFG->{fow_enable}) {	285	if ($::CFG->{fow_enable}) {
253	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	286	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
…		…
255	glConvolutionFilter2D (	288	glConvolutionFilter2D (
256	GL_CONVOLUTION_2D,	289	GL_CONVOLUTION_2D,
257	GL_ALPHA,	290	GL_ALPHA,
258	3, 3,	291	3, 3,
259	GL_ALPHA, GL_FLOAT,	292	GL_ALPHA, GL_FLOAT,
260	pack "f*",	293	(pack "f*", @{ $self->{smooth_matrix} }),
261	0.05, 0.13, 0.05,
262	0.13, 0.30, 0.13,
263	0.05, 0.13, 0.05,
264	);	294	);
265	glEnable GL_CONVOLUTION_2D;	295	glEnable GL_CONVOLUTION_2D;
266	}	296	}
267		297
268	$self->{fow_texture_name} \|\|= glGenTexture;	298	$self->{fow_texture_name} \|\|= glGenTexture;
…		…
453		483
454	$self->{entry} = new CFClient::UI::Entry	484	$self->{entry} = new CFClient::UI::Entry
455	on_changed => sub {	485	on_changed => sub {
456	$self->update_labels;	486	$self->update_labels;
457	},	487	},
		488	on_button_down => sub {
		489	my ($entry, $ev, $x, $y) = @_;
		490
		491	if ($ev->{button} == 3) {
		492	(new CFClient::UI::Menu
		493	items => [
		494	["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]
		495	],
		496	)->popup ($ev);
		497	return 1;
		498	}
		499	0
		500	},
458	on_key_down => sub {	501	on_key_down => sub {
459	my ($entry, $ev) = @_;	502	my ($entry, $ev) = @_;
460		503
461	my $self = $entry->{parent}{parent};	504	my $self = $entry->{parent}{parent};
462		505
463	if ($ev->{sym} == 13) {	506	if ($ev->{sym} == 13) {
464	if (exists $self->{select}) {	507	if (exists $self->{select}) {
465	$self->{last_command} = $self->{select};	508	$self->{last_command} = $self->{select};
466	$::CONN->user_send ($self->{select});	509	$::CONN->user_send ($self->{select});
		510
		511	unshift @{$self->{history}}, $self->{select};
		512	$self->{hist_ptr} = 0;
		513
467	$self->hide;	514	$self->hide;
468	}	515	}
469	} elsif ($ev->{sym} == 27) {	516	} elsif ($ev->{sym} == 27) {
		517	$self->{hist_ptr} = 0;
470	$self->hide;	518	$self->hide;
471	return;	519	return;
472	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	520	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		521	if ($self->{hist_ptr} > 1) {
		522	$self->{hist_ptr}--;
		523	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		524	} elsif ($self->{hist_ptr} > 0) {
		525	$self->{hist_ptr}--;
		526	$self->{entry}->set_text ($self->{hist_saveback});
		527	} else {
473	++$self->{select_offset}	528	++$self->{select_offset}
474	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	529	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		530	}
475	$self->update_labels;	531	$self->update_labels;
476	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	532	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		533	if ($self->{select_offset}) {
477	--$self->{select_offset}	534	--$self->{select_offset}
		535	} else {
		536	unless ($self->{hist_ptr}) {
		537	$self->{hist_saveback} = $self->{entry}->get_text;
		538	}
		539	if ($self->{hist_ptr} <= $#{$self->{history}}) {
478	if $self->{select_offset};	540	$self->{hist_ptr}++;
		541	}
		542	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		543	if exists $self->{history}->[$self->{hist_ptr} - 1];
		544	}
479	$self->update_labels;	545	$self->update_labels;
480	} else {	546	} else {
481	return 0;	547	return 0;
482	}	548	}
483		549

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC vs. Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC