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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs.
Revision 1.26 by root, Wed May 17 16:17:01 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 SDL;	8	use CFClient::OpenGL;
8	use SDL::OpenGL;
9		9
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 => (glGenLists 1),	18	list => glGenList,
19	@_	19	@_
20	)	20	);
21	}
22		21
23	sub key_down {	22	$self
24	print "MAPKEYDOWN\n";
25	}	23	}
26		24
27	sub key_up {	25	sub DESTROY {
		26	my $self = shift;
		27
		28	glDeleteList $self->{list};
		29
		30	$self->SUPER::DESTROY;
28	}	31	}
29		32
30	sub button_down {	33	sub button_down {
31	my ($self, $ev, $x, $y) = @_;	34	my ($self, $ev, $x, $y) = @_;
32		35
33	$self->focus_in;	36	$self->focus_in;
34		37
35	if ($ev->button == 2) {	38	if ($ev->{button} == 2) {
36	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	39	my ($ox, $oy) = ($ev->{x}, $ev->{y});
37	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	40	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
38		41
39	$self->{motion} = sub {	42	$self->{motion} = sub {
40	my ($ev, $x, $y) = @_;	43	my ($ev, $x, $y) = @_;
41		44
42	($x, $y) = ($ev->motion_x, $ev->motion_y);	45	($x, $y) = ($ev->{x}, $ev->{y});
43		46
44	$::CFG->{map_shift_x} = $bw + $x - $ox;	47	$::CFG->{map_shift_x} = $bw + $x - $ox;
45	$::CFG->{map_shift_y} = $bh + $y - $oy;	48	$::CFG->{map_shift_y} = $bh + $y - $oy;
46		49
47	$self->update;	50	$self->update;
76	}	79	}
77		80
78	sub draw {	81	sub draw {
79	my ($self) = @_;	82	my ($self) = @_;
80		83
		84	return
		85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;
		86
81	if (delete $self->{need_update}) {	87	if (delete $self->{need_update}) {
82	glNewList $self->{list}, GL_COMPILE;	88	glNewList $self->{list};
83		89
84	if ($::MAP) {	90	if ($::MAP) {
85	my $sw = int $::WIDTH / 32;	91	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
86	my $sh = int $::HEIGHT / 32;	92	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
87		93
88	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	94	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
89	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	95	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		96
		97	glPushMatrix;
		98	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
90		99
91	glTranslate $sx0 - 32, $sy0 - 32, 0;	100	glTranslate $sx0 - 32, $sy0 - 32, 0;
92		101
93	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);
94		103
…		…
99	GL_CONVOLUTION_2D,	108	GL_CONVOLUTION_2D,
100	GL_ALPHA,	109	GL_ALPHA,
101	3, 3,	110	3, 3,
102	GL_ALPHA, GL_FLOAT,	111	GL_ALPHA, GL_FLOAT,
103	pack "f*",	112	pack "f*",
104	0.1, 0.1, 0.1,	113	0.05, 0.13, 0.05,
105	0.1, 0.2, 0.1,	114	0.13, 0.30, 0.13,
106	0.1, 0.1, 0.1,	115	0.05, 0.13, 0.05,
107	);	116	);
108	glEnable GL_CONVOLUTION_2D;	117	glEnable GL_CONVOLUTION_2D;
109	}	118	}
110		119
111	$self->{fow_texture} = new CFClient::Texture	120	$self->{fow_texture} = new CFClient::Texture
…		…
120	glEnable GL_BLEND;	129	glEnable GL_BLEND;
121	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	130	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
122	glEnable GL_TEXTURE_2D;	131	glEnable GL_TEXTURE_2D;
123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	132	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
124		133
125	glColor +($::CFG->{fow_intensity}) x 3, 1;	134	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
126	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	135	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
127		136
128	glDisable GL_TEXTURE_2D;	137	glDisable GL_TEXTURE_2D;
129	glDisable GL_BLEND;	138	glDisable GL_BLEND;
130	}	139	}
131		140
132	# HACK BEGIN	141	glPopMatrix;
133	{
134	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
135	my ($w, $h) = (250, 250);
136
137	glEnable GL_BLEND;
138	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
139	glEnable GL_TEXTURE_2D;
140	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
141
142	$self->{mapmap_texture} =
143	new CFClient::Texture
144	w => $w,
145	h => $h,
146	data => $::MAP->mapmap ($w, $h),
147	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
148
149	$self->{mapmap_texture}->draw_quad (100, 100);
150
151	glDisable GL_TEXTURE_2D;
152	glDisable GL_BLEND;
153	}
154	# HACK END
155	}	142	}
156		143
157	glEndList;	144	glEndList;
158	}	145	}
159		146
…		…
174	glDisable GL_COLOR_LOGIC_OP;	161	glDisable GL_COLOR_LOGIC_OP;
175	}	162	}
176	}	163	}
177		164
178	my %DIR = (	165	my %DIR = (
179	SDLK_KP8, [1, "north"],	166	CFClient::SDLK_KP8, [1, "north"],
180	SDLK_KP9, [2, "northeast"],	167	CFClient::SDLK_KP9, [2, "northeast"],
181	SDLK_KP6, [3, "east"],	168	CFClient::SDLK_KP6, [3, "east"],
182	SDLK_KP3, [4, "southeast"],	169	CFClient::SDLK_KP3, [4, "southeast"],
183	SDLK_KP2, [5, "south"],	170	CFClient::SDLK_KP2, [5, "south"],
184	SDLK_KP1, [6, "southwest"],	171	CFClient::SDLK_KP1, [6, "southwest"],
185	SDLK_KP4, [7, "west"],	172	CFClient::SDLK_KP4, [7, "west"],
186	SDLK_KP7, [8, "northwest"],	173	CFClient::SDLK_KP7, [8, "northwest"],
187		174
188	SDLK_UP, [1, "north"],	175	CFClient::SDLK_UP, [1, "north"],
189	SDLK_RIGHT, [3, "east"],	176	CFClient::SDLK_RIGHT, [3, "east"],
190	SDLK_DOWN, [5, "south"],	177	CFClient::SDLK_DOWN, [5, "south"],
191	SDLK_LEFT, [7, "west"],	178	CFClient::SDLK_LEFT, [7, "west"],
192	);	179	);
193		180
194	sub key_down {	181	sub key_down {
195	my ($self, $ev) = @_;	182	my ($self, $ev) = @_;
196		183
		184	return unless $::CONN;
		185
197	my $mod = $ev->key_mod;	186	my $mod = $ev->{mod};
198	my $sym = $ev->key_sym;	187	my $sym = $ev->{sym};
		188	my $uni = $ev->{unicode};
199		189
200	if ($sym == SDLK_KP5) {	190	if ($sym == CFClient::SDLK_KP5) {
201	$::CONN->user_send ("stay fire");	191	$::CONN->user_send ("stay fire");
202	} elsif ($sym == SDLK_a) {	192	} elsif ($uni == ord ",") {
		193	$::CONN->user_send ("take");
		194	} elsif ($uni == ord "\t") {
203	$::CONN->user_send ("apply");	195	$::CONN->user_send ("apply");
204	} elsif ($sym == SDLK_QUOTE) {	196	} elsif ($uni == ord "'") {
205	$self->emit ('activate_console');	197	$self->emit ('activate_console');
206	} elsif ($sym == SDLK_SLASH) {	198	} elsif ($uni == ord "/") {
207	$self->emit ('activate_console' => '/');	199	$self->emit (activate_console => '/');
208	} elsif (exists $DIR{$sym}) {	200	} elsif (exists $DIR{$sym}) {
209	if ($mod & KMOD_SHIFT) {	201	if ($mod & CFClient::KMOD_SHIFT) {
210	$self->{shft}++;	202	$self->{shft}++;
211	$::CONN->user_send ("fire $DIR{$sym}[0]");	203	$::CONN->user_send ("fire $DIR{$sym}[0]");
212	} elsif ($mod & KMOD_CTRL) {	204	} elsif ($mod & CFClient::KMOD_CTRL) {
213	$self->{ctrl}++;	205	$self->{ctrl}++;
214	$::CONN->user_send ("run $DIR{$sym}[0]");	206	$::CONN->user_send ("run $DIR{$sym}[0]");
215	} else {	207	} else {
216	$::CONN->user_send ("$DIR{$sym}[1]");	208	$::CONN->user_send ("$DIR{$sym}[1]");
217	}	209	}
		210	} elsif ($ev->{unicode}) {
		211	$self->{command_widget} \|\|=
		212	new CFClient::MapWidget::Command::
		213	command => $self->{command},
		214	can_focus => 1,
		215	connect_execute => sub {
		216	# todo: support callback instead of user_send
		217	$::CONN->user_send ($_[1]);
		218	},
		219	connect_close => sub {
		220	(delete $self->{command_widget})->hide;
		221	$self->focus_in;
		222	},
		223	;
		224	$self->{command_widget}->key_down ($ev)
		225	unless $ev->{unicode} == 20;
		226	return unless $self->{command_widget};
		227	$self->{command_widget}->show;
		228	$self->{command_widget}->focus_in;
218	}	229	}
219	}	230	}
220		231
221	sub key_up {	232	sub key_up {
222	my ($self, $ev) = @_;	233	my ($self, $ev) = @_;
223		234
224	my $mod = $ev->key_mod;	235	my $mod = $ev->{mod};
225	my $sym = $ev->key_sym;	236	my $sym = $ev->{sym};
226		237
227	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	238	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
228	$::CONN->user_send ("fire_stop");	239	$::CONN->user_send ("fire_stop");
229	}	240	}
230	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	241	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
231	$::CONN->user_send ("run_stop");	242	$::CONN->user_send ("run_stop");
232	}	243	}
233	}	244	}
234		245
235	sub add_command {	246	sub add_command {
236	my ($self, $command, $widget, $cb) = @_;	247	my ($self, $command, $tooltip, $widget, $cb) = @_;
237		248
238	(my $abbrev = $command) =~ s/(\S)[^[:space:]_][[:space:]_]/$1/g;	249	(my $data = $command) =~ s/\\//g;
239	warn "$command\|$abbrev\|$widget\n";#d#	250
		251	$tooltip =~ s/^\s+//;
		252
		253	$tooltip = "<big>$data</big>\n\n$tooltip";
		254
		255	$tooltip =~ s/\s+$//;
		256
		257	$self->{command}{$command} = [$data, $tooltip, $widget, $cb];
		258	}
		259
		260	sub clr_commands {
		261	my ($self) = @_;
		262
		263	%{$self->{command}} = ();
		264	}
		265
		266	package CFClient::MapWidget::MapMap;
		267
		268	our @ISA = CFClient::UI::Base::;
		269
		270	use Time::HiRes qw(time);
		271	use CFClient::OpenGL;
		272
		273	sub size_request {
		274	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		275	}
		276
		277	sub size_allocate {
		278	my ($self, $w, $h) = @_;
		279
		280	$self->SUPER::size_allocate ($w, $h);
		281	$self->update;
		282	}
		283
		284	sub update {
		285	my ($self) = @_;
		286
		287	delete $self->{texture_atime};
		288	$self->SUPER::update;
		289	}
		290
		291	sub _draw {
		292	my ($self) = @_;
		293
		294	$::MAP or return;
		295
		296	my ($w, $h) = @$self{qw(w h)};
		297
		298	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		299	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		300
		301	my $sx = int $::CFG->{map_shift_x} / 32;
		302	my $sy = int $::CFG->{map_shift_y} / 32;
		303
		304	my $ox = 0.5 * ($w - $sw);
		305	my $oy = 0.5 * ($h - $sh);
		306
		307	glEnable GL_BLEND;
		308	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		309	glEnable GL_TEXTURE_2D;
		310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		311
		312	if ($self->{texture_atime} < time) {
		313	$self->{texture_atime} = time + 1/3;
		314
		315	$self->{texture} =
		316	new CFClient::Texture
		317	w => $w,
		318	h => $h,
		319	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		320	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		321	}
		322
		323	$self->{texture}->draw_quad (0, 0);
		324
		325	glDisable GL_TEXTURE_2D;
		326
		327	glTranslate 0.375, 0.375;
		328
		329	#TODO: map scale is completely borked
		330
		331	my $x0 = int $ox - $sx + 0.5;
		332	my $y0 = int $oy - $sy + 0.5;
		333
		334	glColor 1, 1, 0, 1;
		335	glBegin GL_LINE_LOOP;
		336	glVertex $x0 , $y0 ;
		337	glVertex $x0 , $y0 + $sh;
		338	glVertex $x0 + $sw, $y0 + $sh;
		339	glVertex $x0 + $sw, $y0 ;
		340	glEnd;
		341
		342	glDisable GL_BLEND;
		343	}
		344
		345	package CFClient::MapWidget::Command;
		346
		347	use strict;
		348
		349	use CFClient::OpenGL;
		350
		351	our @ISA = CFClient::UI::Frame::;
		352
		353	sub new {
		354	my $class = shift;
		355
		356	my $self = $class->SUPER::new (
		357	bg => [0, 0, 0, 0.8],
		358	@_,
		359	);
		360
		361	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		362
		363	$self->{label} = [
		364	map
		365	CFClient::UI::Label->new (
		366	can_hover => 1,
		367	can_events => 1,
		368	tooltip_width => 0.33,
		369	fontsize => $_,
		370	), (0.8) x 6
		371	];
		372
		373	$self->{entry} = new CFClient::UI::Entry
		374	connect_changed => sub {
		375	$self->update_labels;
		376	};
		377
		378	$self->{vbox}->add (
		379	$self->{entry},
		380	@{$self->{label}},
		381	);
		382
		383	$self
		384	}
		385
		386	sub size_allocate {
		387	my ($self, $w, $h) = @_;
		388
		389	$self->SUPER::size_allocate ($w, $h);
		390	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		391	}
		392
		393	sub key_down {
		394	my ($self, $ev) = @_;
		395
		396	if ($ev->{sym} == 13) {
		397	if (exists $self->{select}) {
		398	$self->emit (execute => $self->{select});
		399	$self->emit ("close");
		400	}
		401	} elsif ($ev->{sym} == 27) {
		402	$self->{entry}->set_text ("");
		403	$self->emit ("close");
		404	return;
		405	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		406	++$self->{select_offset}
		407	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		408	$self->update_labels;
		409	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		410	--$self->{select_offset}
		411	if $self->{select_offset};
		412	$self->update_labels;
		413	} else {
		414	#$self->{entry}{force_alloc} = 1;
		415	$self->{entry}->key_down ($ev);
		416	}
		417	}
		418
		419	sub update_labels {
		420	my ($self) = @_;
		421
		422	my $text = $self->{entry}->get_text;
		423
		424	length $text
		425	or return $self->emit ("close");
		426
		427	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		428
		429	if ($cmd ne $self->{last_search}) {
		430	my $regexp = do {
		431	my ($beg, @chr) = split //, lc $cmd;
		432
		433	# the following regex is used to match our "completion entry"
		434	# to an actual command - the parentheses match kind of "overhead"
		435	# - the more characters the parentheses match, the less attractive
		436	# is the match.
		437	my $regexp = "^\Q$beg\E"
		438	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		439	qr<$regexp>
		440	};
		441
		442	my @match;
		443	my @penalty;
		444
		445	for (keys %{$self->{command}}) {
		446	if (@penalty = $_ =~ $regexp) {
		447	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		448	}
		449	}
		450
		451	@match = map $self->{command}{$_->[0]},
		452	sort {
		453	$a->[1] <=> $b->[1]
		454	or (length $a->[0]) <=> (length $b->[0])
		455	} @match;
		456
		457	$self->{last_search} = $cmd;
		458	$self->{last_match} = \@match;
		459
		460	$self->{select_offset} = 0;
		461	}
		462
		463	my @labels = @{ $self->{label} };
		464	my @matches = @{ $self->{last_match} \|\| [] };
		465
		466	if ($self->{select_offset}) {
		467	splice @matches, 0, $self->{select_offset}, ();
		468
		469	my $label = shift @labels;
		470	$label->set_text ("...");
		471	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		472	}
		473
		474	for my $label (@labels) {
		475	$label->{fg} = [1, 1, 1, 1];
		476	$label->{bg} = [0, 0, 0, 0];
		477	}
		478
		479	if (@matches) {
		480	$self->{select} = "$matches[0][0]$arg";
		481
		482	$labels[0]->{fg} = [0, 0, 0, 1];
		483	$labels[0]->{bg} = [1, 1, 1, 0.8];
		484	} else {
		485	$self->{select} = "$cmd$arg";
		486	}
		487
		488	for my $match (@matches) {
		489	my $label = shift @labels;
		490
		491	if (@labels) {
		492	$label->set_text ("$match->[0]$arg");
		493	$label->set_tooltip ($match->[1]);
		494	} else {
		495	$label->set_text ("...");
		496	$label->set_tooltip ("Use Cursor-Down to view more matches");
		497	last;
		498	}
		499	}
		500
		501	for my $label (@labels) {
		502	$label->set_text ("");
		503	$label->set_tooltip ("");
		504	}
		505
		506	$self->update;
		507	###
		508	}
		509
		510	sub _draw {
		511	my ($self) = @_;
		512
		513	# hack
		514	local $CFClient::UI::FOCUS = $self->{entry};
		515
		516	$self->SUPER::_draw;
240	}	517	}
241		518
242	1	519	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs. Revision 1.26 by root, Wed May 17 16:17:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs.
Revision 1.26 by root, Wed May 17 16:17:01 2006 UTC