[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.59 by root, Wed Jun 14 16:20:22 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
		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	}
22		28
23	sub DESTROY {	29	$self->{completer} = new CFClient::MapWidget::Command::
		30	command => $self->{command},
		31	can_focus => 1,
		32	tooltip => "<b>The Command Completer</b>\n\n"
		33	. "This is your central interface to send text commands to the server. "
		34	. "To enter a verbatim command to send to the server, just type the command, "
		35	. "followed by a space, and press return. "
		36	. "Typing the initial letters of words (or just any letters) displays guesses "
		37	. "for commands you might want to use.\n"
		38	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
		39	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
		40	;
		41
		42	$self
		43	}
		44
		45	sub add_command {
		46	my ($self, $command, $tooltip, $widget, $cb) = @_;
		47
		48	(my $data = $command) =~ s/\\//g;
		49
		50	$tooltip =~ s/^\s+//;
		51	$tooltip = "<big>$data</big>\n\n$tooltip";
		52	$tooltip =~ s/\s+$//;
		53
		54	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		55	}
		56
		57	sub clr_commands {
24	my $self = shift;	58	my ($self) = @_;
25		59
26	glDeleteList $self->{list};	60	%{$self->{completer}{command}} = ();
27
28	$self->SUPER::DESTROY;
29	}	61	}
30		62
31	sub button_down {	63	sub button_down {
32	my ($self, $ev, $x, $y) = @_;	64	my ($self, $ev, $x, $y) = @_;
33		65
		66	return unless $::CONN;
		67
34	$self->focus_in;	68	$self->focus_in;
35		69
36	if ($ev->{button} == 2) {	70	if ($ev->{button} == 1) {
		71	my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});
		72	my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});
		73
		74	$x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
		75	$y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
		76
		77	$x -= int 0.5 * $::MAP->w;
		78	$y -= int 0.5 * $::MAP->h;
		79
		80	$x += 1;
		81	$y += 1;
		82
		83	$::CONN->lookat ($x, $y)
		84	if $::CONN;
		85
		86	} elsif ($ev->{button} == 2) {
37	my ($ox, $oy) = ($ev->{x}, $ev->{y});	87	my ($ox, $oy) = ($ev->{x}, $ev->{y});
38	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	88	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
39		89
40	$self->{motion} = sub {	90	$self->{motion} = sub {
41	my ($ev, $x, $y) = @_;	91	my ($ev, $x, $y) = @_;
…		…
46	$::CFG->{map_shift_y} = $bh + $y - $oy;	96	$::CFG->{map_shift_y} = $bh + $y - $oy;
47		97
48	$self->update;	98	$self->update;
49	};	99	};
50	}	100	}
		101
		102	1
51	}	103	}
52		104
53	sub button_up {	105	sub button_up {
54	my ($self, $ev, $x, $y) = @_;	106	my ($self, $ev, $x, $y) = @_;
55		107
56	delete $self->{motion};	108	delete $self->{motion};
		109
		110	1
57	}	111	}
58		112
59	sub mouse_motion {	113	sub mouse_motion {
60	my ($self, $ev, $x, $y) = @_;	114	my ($self, $ev, $x, $y) = @_;
61		115
		116	if ($self->{motion}) {
62	$self->{motion}->($ev, $x, $y) if $self->{motion};	117	$self->{motion}->($ev, $x, $y);
		118	} else {
		119	return 0;
		120	}
		121
		122	1
63	}	123	}
64		124
65	sub size_request {	125	sub size_request {
66	(	126	(
67	1 + 32 * int $::WIDTH / 32,	127	1 + 32 * int $::WIDTH / 32,
…		…
72	sub update {	132	sub update {
73	my ($self) = @_;	133	my ($self) = @_;
74		134
75	$self->{need_update} = 1;	135	$self->{need_update} = 1;
76	$self->SUPER::update;	136	$self->SUPER::update;
77	}
78
79	sub draw {
80	my ($self) = @_;
81
82	if (delete $self->{need_update}) {
83	glNewList $self->{list};
84
85	if ($::MAP) {
86	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale});
87	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});
88
89	glPushMatrix;
90	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
95	glTranslate $sx0 - 32, $sy0 - 32, 0;
96
97	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
98
99	if ($::CFG->{fow_enable}) {
100	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
101	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
102	glConvolutionFilter2D (
103	GL_CONVOLUTION_2D,
104	GL_ALPHA,
105	3, 3,
106	GL_ALPHA, GL_FLOAT,
107	pack "f*",
108	0.05, 0.13, 0.05,
109	0.13, 0.30, 0.13,
110	0.05, 0.13, 0.05,
111	);
112	glEnable GL_CONVOLUTION_2D;
113	}
114
115	$self->{fow_texture} = new CFClient::Texture
116	w => $w,
117	h => $h,
118	data => $data,
119	internalformat => GL_ALPHA,
120	format => GL_ALPHA;
121
122	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
123
124	glEnable GL_BLEND;
125	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
126	glEnable GL_TEXTURE_2D;
127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
128
129	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
130	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
131
132	glDisable GL_TEXTURE_2D;
133	glDisable GL_BLEND;
134	}
135
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;
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	}
177
178	glEndList;
179	}
180
181	glPushMatrix;
182	glCallList $self->{list};
183	glPopMatrix;
184
185	if ($CFClient::UI::FOCUS != $self) {
186	glColor 64/255, 64/255, 64/255;
187	glLogicOp GL_AND;
188	glEnable GL_COLOR_LOGIC_OP;
189	glBegin GL_QUADS;
190	glVertex 0, 0;
191	glVertex 0, $::HEIGHT;
192	glVertex $::WIDTH, $::HEIGHT;
193	glVertex $::WIDTH, 0;
194	glEnd;
195	glDisable GL_COLOR_LOGIC_OP;
196	}
197	}	137	}
198		138
199	my %DIR = (	139	my %DIR = (
200	CFClient::SDLK_KP8, [1, "north"],	140	CFClient::SDLK_KP8, [1, "north"],
201	CFClient::SDLK_KP9, [2, "northeast"],	141	CFClient::SDLK_KP9, [2, "northeast"],
…		…
213	);	153	);
214		154
215	sub key_down {	155	sub key_down {
216	my ($self, $ev) = @_;	156	my ($self, $ev) = @_;
217		157
		158	return 0 unless $::CONN;
		159
218	my $mod = $ev->{mod};	160	my $mod = $ev->{mod};
219	my $sym = $ev->{sym};	161	my $sym = $ev->{sym};
		162	my $uni = $ev->{unicode};
220		163
221	if ($sym == CFClient::SDLK_KP5) {	164	if ($sym == CFClient::SDLK_KP5) {
222	$::CONN->user_send ("stay fire");	165	$::CONN->user_send ("stay fire");
223	} elsif ($sym == ord ",") {	166	} elsif ($uni == ord ",") {
224	$::CONN->user_send ("take");	167	$::CONN->user_send ("take");
225	} elsif ($sym == ord "a") {	168	} elsif ($uni == ord " ") {
226	$::CONN->user_send ("apply");	169	$::CONN->user_send ("apply");
		170	} elsif ($uni == ord ".") {
		171	$::CONN->user_send ($self->{completer}{last_command})
		172	if exists $self->{completer}{last_command};
		173	} elsif ($uni == ord "\t") {
		174	$::INV_WINDOW->toggle_visibility;
		175	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
		176	$::CONN->user_send ("rotateshoottype +");
		177	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
		178	$::CONN->user_send ("rotateshoottype -");
		179	} elsif ($uni == ord '"') {
		180	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		181	$self->{completer}->show;
227	} elsif ($sym == ord "'") {	182	} elsif ($uni == ord "'") {
228	$self->emit ('activate_console');	183	$self->{completer}->set_prefix ("");
229	} elsif ($sym == ord "/") {	184	$self->{completer}->show;
230	$self->emit (activate_console => '/');
231	} elsif (exists $DIR{$sym}) {	185	} elsif (exists $DIR{$sym}) {
232	if ($mod & CFClient::KMOD_SHIFT) {	186	if ($mod & CFClient::KMOD_SHIFT) {
233	$self->{shft}++;	187	$self->{shft}++;
		188	if ($DIR{$sym}[0] != $self->{fire_dir}) {
234	$::CONN->user_send ("fire $DIR{$sym}[0]");	189	$::CONN->user_send ("fire $DIR{$sym}[0]");
		190	}
		191	$self->{fire_dir} = $DIR{$sym}[0];
235	} elsif ($mod & CFClient::KMOD_CTRL) {	192	} elsif ($mod & CFClient::KMOD_CTRL) {
236	$self->{ctrl}++;	193	$self->{ctrl}++;
237	$::CONN->user_send ("run $DIR{$sym}[0]");	194	$::CONN->user_send ("run $DIR{$sym}[0]");
238	} else {	195	} else {
239	$::CONN->user_send ("$DIR{$sym}[1]");	196	$::CONN->user_send ("$DIR{$sym}[1]");
240	}	197	}
241	} elsif ($ev->{unicode}) {	198	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
242	$self->{command_widget} \|\|=	199	$::BIND_EDITOR->set_binding (undef, undef, [],
243	new CFClient::MapWidget::Command::	200	sub {
244	command => $self->{command},	201	my ($mod, $sym, $cmds) = @_;
245	can_focus => 1,	202	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
246	connect_execute => sub {
247	# todo: support callback instead of user_send
248	$::CONN->user_send ($_[1][1]);
249	},	203	});
250	connect_close => sub {	204	$::BIND_EDITOR->start;
251	(delete $self->{command_widget})->hide;	205	$::BIND_EDITOR->show;
252	$self->focus_in;	206	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
253	},	207	$::BIND_EDITOR->stop;
254	;	208	$::BIND_EDITOR->ask_for_bind_and_commit;
		209	$::BIND_EDITOR->hide;
		210	} elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
		211	$::CONN->user_send ($_) for @$bind_cmd;
		212	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
255	$self->{command_widget}->key_down ($ev);	213	$self->{completer}->key_down ($ev);
256	return unless $self->{command_widget};
257	$self->{command_widget}->show;	214	$self->{completer}->show;
258	$self->{command_widget}->focus_in;	215	} else {
		216	return 0;
		217	}
		218
259	}	219	1
260	}	220	}
261		221
262	sub key_up {	222	sub key_up {
263	my ($self, $ev) = @_;	223	my ($self, $ev) = @_;
264		224
		225	my $res = 0;
265	my $mod = $ev->{mod};	226	my $mod = $ev->{mod};
266	my $sym = $ev->{sym};	227	my $sym = $ev->{sym};
267		228
		229	if ($::CFG->{shift_fire_stop}) {
268	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	230	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269	$::CONN->user_send ("fire_stop");	231	$::CONN->user_send ("fire_stop");
		232	delete $self->{fire_dir};
		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	}
270	}	245	}
		246
271	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	247	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272	$::CONN->user_send ("run_stop");	248	$::CONN->user_send ("run_stop");
		249	$res = 1;
		250	}
		251
		252	$res
		253	}
		254
		255	sub draw {
		256	my ($self) = @_;
		257
		258	my $focused = $CFClient::UI::FOCUS == $self
		259	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
		260
		261	return
		262	unless $::CONN && ($focused \|\| !$::FAST);
		263
		264	if (delete $self->{need_update}) {
		265	$self->{fow_texture} \|\|= glGenTexture;
		266
		267	glNewList $self->{list};
		268
		269	if ($::MAP) {
		270	my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		271	my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		272
		273	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
		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;
		277
		278	glPushMatrix;
		279	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		280
		281	glTranslate $sx0, $sy0;
		282
		283	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		284
		285	if ($::CFG->{fow_enable}) {
		286	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
		287	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
		288	glConvolutionFilter2D (
		289	GL_CONVOLUTION_2D,
		290	GL_ALPHA,
		291	3, 3,
		292	GL_ALPHA, GL_FLOAT,
		293	(pack "f*", @{ $self->{smooth_matrix} }),
		294	);
		295	glEnable GL_CONVOLUTION_2D;
		296	}
		297
		298	$self->{fow_texture_name} \|\|= glGenTexture;
		299	# try to re-use the texture name: TODO improve texture class instead
		300
		301	$self->{fow_texture} = new CFClient::Texture
		302	w => $w,
		303	h => $h,
		304	data => $data,
		305	name => $self->{fow_texture_name},
		306	internalformat => GL_ALPHA,
		307	format => GL_ALPHA;
		308
		309	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		310
		311	glEnable GL_TEXTURE_2D;
		312	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		313
		314	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
		315	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
		316
		317	glDisable GL_TEXTURE_2D;
		318	}
		319
		320	glPopMatrix;
		321	}
		322
		323	glEndList;
		324	}
		325
		326	glPushMatrix;
		327	glCallList $self->{list};
		328	glPopMatrix;
		329
		330	# TNT2 emulates logops in software (or worse :)
		331	if ($focused) {
		332	(delete $self->{out_of_focus})->destroy
		333	if $self->{out_of_focus};
		334	} else {
		335	glColor 0.4, 0.2, 0.2, 0.6;
		336	glEnable GL_BLEND;
		337	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		338	glBegin GL_QUADS;
		339	glVertex 0, 0;
		340	glVertex 0, $::HEIGHT;
		341	glVertex $::WIDTH, $::HEIGHT;
		342	glVertex $::WIDTH, 0;
		343	glEnd;
		344	glDisable GL_BLEND;
		345
		346	# $self->{out_of_focus} \|\|= do {
		347	# my $label = new CFClient::UI::Label
		348	# x => 0,
		349	# y => 0,
		350	# z => 1,
		351	# ellipsise => 0,
		352	# text => "map out of focus (click map to play)";
		353	#
		354	# $label->show;
		355	# $label->update;
		356	#
		357	# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
		358	# $label->move_abs (
		359	# ($::WIDTH - $label->{w}) * 0.5,
		360	# ($::HEIGHT - $label->{h}) * 0.5,
		361	# );
		362	# });
		363	#
		364	# $label
		365	# };
		366	}
		367	}
		368
		369	sub DESTROY {
		370	my $self = shift;
		371
		372	glDeleteList $self->{list};
		373
		374	$self->SUPER::DESTROY;
		375	}
		376
		377	package CFClient::MapWidget::MapMap;
		378
		379	our @ISA = CFClient::UI::Base::;
		380
		381	use Time::HiRes qw(time);
		382	use CFClient::OpenGL;
		383
		384	sub size_request {
		385	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		386	}
		387
		388	sub size_allocate {
		389	my ($self, $w, $h) = @_;
		390
		391	$self->SUPER::size_allocate ($w, $h);
		392	$self->update;
		393	}
		394
		395	sub update {
		396	my ($self) = @_;
		397
		398	delete $self->{texture_atime};
		399	$self->SUPER::update;
		400	}
		401
		402	sub _draw {
		403	my ($self) = @_;
		404
		405	$::MAP or return;
		406
		407	my ($w, $h) = @$self{qw(w h)};
		408
		409	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		410	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		411
		412	my $sx = int $::CFG->{map_shift_x} / 32;
		413	my $sy = int $::CFG->{map_shift_y} / 32;
		414
		415	my $ox = 0.5 * ($w - $sw);
		416	my $oy = 0.5 * ($h - $sh);
		417
		418	glEnable GL_BLEND;
		419	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		420	glEnable GL_TEXTURE_2D;
		421	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		422
		423	if ($self->{texture_atime} < time) {
		424	$self->{texture_atime} = time + 1/3;
		425
		426	$self->{texture} =
		427	new CFClient::Texture
		428	w => $w,
		429	h => $h,
		430	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		431	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		432	}
		433
		434	$self->{texture}->draw_quad (0, 0);
		435
		436	glDisable GL_TEXTURE_2D;
		437
		438	glTranslate 0.375, 0.375;
		439
		440	#TODO: map scale is completely borked
		441
		442	my $x0 = int $ox - $sx + 0.5;
		443	my $y0 = int $oy - $sy + 0.5;
		444
		445	glColor 1, 1, 0, 1;
		446	glBegin GL_LINE_LOOP;
		447	glVertex $x0 , $y0 ;
		448	glVertex $x0 , $y0 + $sh;
		449	glVertex $x0 + $sw, $y0 + $sh;
		450	glVertex $x0 + $sw, $y0 ;
		451	glEnd;
273	}	452
274	}	453	glDisable GL_BLEND;
275
276	sub add_command {
277	my ($self, $command, $tooltip, $widget, $cb) = @_;
278
279	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
280
281	push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
282	}	454	}
283		455
284	package CFClient::MapWidget::Command;	456	package CFClient::MapWidget::Command;
285		457
286	use strict;	458	use strict;
287		459
288	use CFClient::OpenGL;	460	use CFClient::OpenGL;
289		461
290	our @ISA = CFClient::UI::VBox::;	462	our @ISA = CFClient::UI::Frame::;
291		463
292	sub new {	464	sub new {
293	my $class = shift;	465	my $class = shift;
294		466
295	my $self = $class->SUPER::new (	467	my $self = $class->SUPER::new (
		468	bg => [0, 0, 0, 0.8],
296	@_,	469	@_,
297	children => [map	470	);
		471
		472	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		473
		474	$self->{label} = [
		475	map
298	CFClient::UI::Label->new (	476	CFClient::UI::Label->new (
299	can_hover => 1,	477	can_hover => 1,
300	can_events => 1,	478	can_events => 1,
		479	tooltip_width => 0.33,
301	fontsize => $_,	480	fontsize => $_,
302	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8	481	), (0.8) x 16
		482	];
		483
		484	$self->{entry} = new CFClient::UI::Entry
		485	on_changed => sub {
		486	$self->update_labels;
303	],	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	},
		501	on_key_down => sub {
		502	my ($entry, $ev) = @_;
		503
		504	my $self = $entry->{parent}{parent};
		505
		506	if ($ev->{sym} == 13) {
		507	if (exists $self->{select}) {
		508	$self->{last_command} = $self->{select};
		509	$::CONN->user_send ($self->{select});
		510
		511	unshift @{$self->{history}}, $self->{select};
		512	$self->{hist_ptr} = 0;
		513
		514	$self->hide;
		515	}
		516	} elsif ($ev->{sym} == 27) {
		517	$self->{hist_ptr} = 0;
		518	$self->hide;
		519	return;
		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 {
		528	++$self->{select_offset}
		529	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		530	}
		531	$self->update_labels;
		532	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		533	if ($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}}) {
		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	}
		545	$self->update_labels;
		546	} else {
		547	return 0;
		548	}
		549
		550	1
		551	}
		552	;
		553
		554	$self->{vbox}->add (
		555	$self->{entry},
		556	@{$self->{label}},
304	);	557	);
305		558
306	$self	559	$self
		560	}
		561
		562	sub set_prefix {
		563	my ($self, $prefix) = @_;
		564
		565	$self->{entry}->set_text ($prefix);
		566	$self->show;
307	}	567	}
308		568
309	sub size_allocate {	569	sub size_allocate {
310	my ($self, $w, $h) = @_;	570	my ($self, $w, $h) = @_;
311		571
312	$self->SUPER::size_allocate ($w, $h);	572	$self->SUPER::size_allocate ($w, $h);
313	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	573	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
314	}	574	}
315		575
316	sub update_labels {	576	sub show {
317	my ($self) = @_;	577	my ($self) = @_;
318		578
319	my $command = $self->{command};	579	$self->SUPER::show;
320	my $search_abbrev = qr/^\Q$self->{search}/;	580	$self->{entry}->focus_in;
321	my $search_full = qr/\Q$self->{search}/;	581	}
322		582
323	my @found;	583	sub hide {
		584	my ($self) = @_;
324		585
325	for (@$command) {	586	$self->SUPER::hide;
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 ("...");	587	$self->{entry}->set_text ("");
347	}
348
349	$self->check_size;
350	}	588	}
351		589
352	sub key_down {	590	sub key_down {
353	my ($self, $ev) = @_;	591	my ($self, $ev) = @_;
354		592
355	if ($ev->{sym} == 8) {	593	$self->{entry}->key_down ($ev)
356	substr $self->{search}, -1, 1, "";	594	}
357	$self->update_labels;	595
358	} elsif ($ev->{sym} == 13) {	596	sub update_labels {
359	if (exists $self->{select}) {	597	my ($self) = @_;
360	$self->emit (execute => $self->{select});	598
361	$self->emit ("close");	599	my $text = $self->{entry}->get_text;
		600
		601	length $text
		602	or return $self->hide;
		603
		604	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		605
		606	if ($text ne $self->{last_search}) {
		607	my @match;
		608
		609	if ($text =~ /^(.*?)\s+$/) {
		610	@match = [$cmd, "(appended whitespace suppresses completion)"];
		611	} else {
		612	my $regexp = do {
		613	my ($beg, @chr) = split //, lc $cmd;
		614
		615	# the following regex is used to match our "completion entry"
		616	# to an actual command - the parentheses match kind of "overhead"
		617	# - the more characters the parentheses match, the less attractive
		618	# is the match.
		619	my $regexp = "^\Q$beg\E"
		620	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		621	qr<$regexp>
		622	};
		623
		624	my @penalty;
		625
		626	for (keys %{$self->{command}}) {
		627	if (@penalty = $_ =~ $regexp) {
		628	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		629	}
		630	}
		631
		632	@match = map $self->{command}{$_->[0]},
		633	sort {
		634	$a->[1] <=> $b->[1]
		635	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		636	or (length $b->[0]) <=> (length $a->[0])
		637	} @match;
362	}	638	}
363	} elsif ($ev->{sym} == 27) {	639
364	$self->emit ("close");	640	$self->{last_search} = $text;
365	return;	641	$self->{last_match} = \@match;
366	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {	642
367	$self->{search} .= chr $ev->{unicode};	643	$self->{select_offset} = 0;
		644	}
		645
		646	my @labels = @{ $self->{label} };
		647	my @matches = @{ $self->{last_match} \|\| [] };
		648
		649	if ($self->{select_offset}) {
		650	splice @matches, 0, $self->{select_offset}, ();
		651
		652	my $label = shift @labels;
		653	$label->set_text ("...");
		654	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		655	}
		656
		657	for my $label (@labels) {
		658	$label->{fg} = [1, 1, 1, 1];
		659	$label->{bg} = [0, 0, 0, 0];
		660	}
		661
		662	if (@matches) {
		663	$self->{select} = "$matches[0][0]$arg";
		664
		665	$labels[0]->{fg} = [0, 0, 0, 1];
		666	$labels[0]->{bg} = [1, 1, 1, 0.8];
		667	} else {
		668	$self->{select} = "$cmd$arg";
		669	}
		670
		671	for my $match (@matches) {
		672	my $label = shift @labels;
		673
		674	if (@labels) {
		675	$label->set_text ("$match->[0]$arg");
		676	$label->set_tooltip ($match->[1]);
		677	} else {
		678	$label->set_text ("...");
		679	$label->set_tooltip ("Use Cursor-Down to view more matches");
		680	last;
		681	}
		682	}
		683
		684	for my $label (@labels) {
		685	$label->set_text ("");
		686	$label->set_tooltip ("");
		687	}
		688
368	$self->update_labels;	689	$self->update;
369	}	690	###
		691	}
370		692
371	length $self->{search}	693	sub _draw {
372	or $self->emit ("close");	694	my ($self) = @_;
		695
		696	# hack
		697	local $CFClient::UI::FOCUS = $self->{entry};
		698
		699	$self->SUPER::_draw;
373	}	700	}
374		701
375	1	702	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.59 by root, Wed Jun 14 16:20:22 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.59 by root, Wed Jun 14 16:20:22 2006 UTC