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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.12 by root, Mon Apr 24 06:05:35 2006 UTC vs. Revision 1.47 by root, Fri Jun 2 22:13:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.12 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.47 by root, Fri Jun 2 22:13:47 2006 UTC