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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.78 by root, Sun Jul 23 16:11:12 2006 UTC

…		…
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
		8	use CFClient;
8	use CFClient::OpenGL;	9	use CFClient::OpenGL;
		10	use CFClient::UI;
9		11
10	our @ISA = CFClient::UI::Base::;	12	our @ISA = CFClient::UI::Base::;
		13
		14	my $magicmap_tex =
		15	new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
		16	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11		17
12	sub new {	18	sub new {
13	my $class = shift;	19	my $class = shift;
14		20
15	my $self = $class->SUPER::new (	21	my $self = $class->SUPER::new (
16	z => -1,	22	z => -1,
17	can_focus => 1,	23	can_focus => 1,
18	list => glGenList,	24	list => glGenList,
		25
		26	smooth_matrix => [
		27	0.05, 0.13, 0.05,
		28	0.13, 0.30, 0.13,
		29	0.05, 0.13, 0.05,
		30	],
		31
19	@_	32	@_
20	);	33	);
21		34
		35	$self->{completer} = new CFClient::MapWidget::Command::
		36	command => $self->{command},
		37	tooltip => "<b>The Command Completer</b>\n\n"
		38	. "This is your central interface to send text commands to the server. "
		39	. "To enter a verbatim command to send to the server, just type the command, "
		40	. "followed by a space, and press return. "
		41	. "Typing the initial letters of words (or just any letters) displays guesses "
		42	. "for commands you might want to use.\n"
		43	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
		44	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
		45	;
		46
22	$self	47	$self
23	}	48	}
24		49
25	sub DESTROY {	50	sub add_command {
		51	my ($self, $command, $tooltip, $widget, $cb) = @_;
		52
		53	(my $data = $command) =~ s/\\//g;
		54
		55	$tooltip =~ s/^\s+//;
		56	$tooltip = "<big>$data</big>\n\n$tooltip";
		57	$tooltip =~ s/\s+$//;
		58
		59	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		60	}
		61
		62	sub clr_commands {
26	my $self = shift;	63	my ($self) = @_;
27		64
28	glDeleteList $self->{list};	65	%{$self->{completer}{command}} = ();
29		66
30	$self->SUPER::DESTROY;	67	$self->{completer}->hide
		68	if $self->{completer};
31	}	69	}
32		70
33	sub button_down {	71	sub invoke_button_down {
34	my ($self, $ev, $x, $y) = @_;	72	my ($self, $ev, $x, $y) = @_;
35		73
36	$self->focus_in;
37
38	if ($ev->{button} == 2) {	74	if ($ev->{button} == 1) {
		75	$self->grab_focus;
		76	return unless $::CONN;
		77
		78	my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
		79	my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
		80
		81	$x -= int 0.5 * $self->{sw};
		82	$y -= int 0.5 * $self->{sh};
		83
		84	$::CONN->lookat ($x, $y)
		85	if $::CONN;
		86
		87	} elsif ($ev->{button} == 2) {
		88	$self->grab_focus;
		89	return unless $::CONN;
		90
39	my ($ox, $oy) = ($ev->{x}, $ev->{y});	91	my ($ox, $oy) = ($ev->{x}, $ev->{y});
40	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	92	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
41		93
42	$self->{motion} = sub {	94	$self->{motion} = sub {
43	my ($ev, $x, $y) = @_;	95	my ($ev, $x, $y) = @_;
…		…
47	$::CFG->{map_shift_x} = $bw + $x - $ox;	99	$::CFG->{map_shift_x} = $bw + $x - $ox;
48	$::CFG->{map_shift_y} = $bh + $y - $oy;	100	$::CFG->{map_shift_y} = $bh + $y - $oy;
49		101
50	$self->update;	102	$self->update;
51	};	103	};
		104	} elsif ($ev->{button} == 3) {
		105	(new CFClient::UI::Menu
		106	items => [
		107	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		108	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		109	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		110	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		111	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		112	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		113	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		114	[
		115	$::PICKUP_ENABLE->{state}
		116	? "Disable automatic pickup"
		117	: "Enable automatic pickup",
		118	sub { $::PICKUP_ENABLE->toggle }
		119	],
		120	],
		121	)->popup ($ev);
		122	}
		123
52	}	124	1
53	}	125	}
54		126
55	sub button_up {	127	sub invoke_button_up {
56	my ($self, $ev, $x, $y) = @_;	128	my ($self, $ev, $x, $y) = @_;
57		129
58	delete $self->{motion};	130	delete $self->{motion};
59	}
60		131
		132	1
		133	}
		134
61	sub mouse_motion {	135	sub invoke_mouse_motion {
62	my ($self, $ev, $x, $y) = @_;	136	my ($self, $ev, $x, $y) = @_;
63		137
		138	if ($self->{motion}) {
64	$self->{motion}->($ev, $x, $y) if $self->{motion};	139	$self->{motion}->($ev, $x, $y);
		140	} else {
		141	return 0;
		142	}
		143
		144	1
65	}	145	}
66		146
67	sub size_request {	147	sub size_request {
68	(	148	(
69	1 + 32 * int $::WIDTH / 32,	149	32 * CFClient::ceil $::WIDTH / 32,
70	1 + 32 * int $::HEIGHT / 32,	150	32 * CFClient::ceil $::HEIGHT / 32,
71	)	151	)
72	}	152	}
73		153
74	sub update {	154	sub update {
75	my ($self) = @_;	155	my ($self) = @_;
76		156
77	$self->{need_update} = 1;	157	$self->{need_update} = 1;
78	$self->SUPER::update;	158	$self->SUPER::update;
79	}
80
81	sub draw {
82	my ($self) = @_;
83
84	if (delete $self->{need_update}) {
85	glNewList $self->{list};
86
87	if ($::MAP) {
88	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
89	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
90
91	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
92	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
93
94	glPushMatrix;
95	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
96
97	glTranslate $sx0 - 32, $sy0 - 32, 0;
98
99	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
100
101	if ($::CFG->{fow_enable}) {
102	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
103	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
104	glConvolutionFilter2D (
105	GL_CONVOLUTION_2D,
106	GL_ALPHA,
107	3, 3,
108	GL_ALPHA, GL_FLOAT,
109	pack "f*",
110	0.05, 0.13, 0.05,
111	0.13, 0.30, 0.13,
112	0.05, 0.13, 0.05,
113	);
114	glEnable GL_CONVOLUTION_2D;
115	}
116
117	$self->{fow_texture} = new CFClient::Texture
118	w => $w,
119	h => $h,
120	data => $data,
121	internalformat => GL_ALPHA,
122	format => GL_ALPHA;
123
124	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
125
126	glEnable GL_BLEND;
127	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
128	glEnable GL_TEXTURE_2D;
129	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
130
131	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
132	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
133
134	glDisable GL_TEXTURE_2D;
135	glDisable GL_BLEND;
136	}
137
138	glPopMatrix;
139	}
140
141	glEndList;
142	}
143
144	glPushMatrix;
145	glCallList $self->{list};
146	glPopMatrix;
147
148	if ($CFClient::UI::FOCUS != $self) {
149	glColor 64/255, 64/255, 64/255;
150	glLogicOp GL_AND;
151	glEnable GL_COLOR_LOGIC_OP;
152	glBegin GL_QUADS;
153	glVertex 0, 0;
154	glVertex 0, $::HEIGHT;
155	glVertex $::WIDTH, $::HEIGHT;
156	glVertex $::WIDTH, 0;
157	glEnd;
158	glDisable GL_COLOR_LOGIC_OP;
159	}
160	}	159	}
161		160
162	my %DIR = (	161	my %DIR = (
163	CFClient::SDLK_KP8, [1, "north"],	162	CFClient::SDLK_KP8, [1, "north"],
164	CFClient::SDLK_KP9, [2, "northeast"],	163	CFClient::SDLK_KP9, [2, "northeast"],
…		…
173	CFClient::SDLK_RIGHT, [3, "east"],	172	CFClient::SDLK_RIGHT, [3, "east"],
174	CFClient::SDLK_DOWN, [5, "south"],	173	CFClient::SDLK_DOWN, [5, "south"],
175	CFClient::SDLK_LEFT, [7, "west"],	174	CFClient::SDLK_LEFT, [7, "west"],
176	);	175	);
177		176
178	sub key_down {	177	sub invoke_key_down {
179	my ($self, $ev) = @_;	178	my ($self, $ev) = @_;
180
181	return unless $::CONN;
182		179
183	my $mod = $ev->{mod};	180	my $mod = $ev->{mod};
184	my $sym = $ev->{sym};	181	my $sym = $ev->{sym};
185	my $uni = $ev->{unicode};	182	my $uni = $ev->{unicode};
186		183
		184	$mod &= CFClient::KMOD_CTRL \| CFClient::KMOD_ALT \| CFClient::KMOD_SHIFT;
		185
		186	if ($uni == ord "\t") {
		187	$::PL_WINDOW->toggle_visibility;
		188	} elsif ($sym == CFClient::SDLK_F1 && !$mod) {
		189	$::HELP_WINDOW->toggle_visibility;
		190	} elsif ($sym == CFClient::SDLK_F2 && !$mod) {
		191	::toggle_player_page ($::STATS_PAGE);
		192	} elsif ($sym == CFClient::SDLK_F3 && !$mod) {
		193	::toggle_player_page ($::SKILL_PAGE);
		194	} elsif ($sym == CFClient::SDLK_F4 && !$mod) {
		195	::toggle_player_page ($::SPELL_PAGE);
		196	} elsif ($sym == CFClient::SDLK_F5 && !$mod) {
		197	::toggle_player_page ($::INVENTORY_PAGE);
		198	} elsif ($sym == CFClient::SDLK_F9 && !$mod) {
		199	$::SETUP_DIALOG->toggle_visibility;
		200	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
		201	$::BIND_EDITOR->set_binding (undef, undef, [],
		202	sub {
		203	my ($mod, $sym, $cmds) = @_;
		204	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
		205	});
		206	$::BIND_EDITOR->start;
		207	$::BIND_EDITOR->show;
		208	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
		209	$::BIND_EDITOR->stop;
		210	$::BIND_EDITOR->ask_for_bind_and_commit;
		211	$::BIND_EDITOR->hide;
		212	} elsif (!$::CONN) {
		213	return 0; # bindings further down need a valid connection
		214
187	if ($sym == CFClient::SDLK_KP5) {	215	} elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
188	$::CONN->user_send ("stay fire");	216	$::CONN->user_send ("stay fire");
189	} elsif ($uni == ord ",") {	217	} elsif ($uni == ord ",") {
190	$::CONN->user_send ("take");	218	$::CONN->user_send ("take");
191	} elsif ($uni == ord "\t") {	219	} elsif ($uni == ord " ") {
192	$::CONN->user_send ("apply");	220	$::CONN->user_send ("apply");
		221	} elsif ($uni == ord ".") {
		222	$::CONN->user_send ($self->{completer}{last_command})
		223	if exists $self->{completer}{last_command};
		224	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
		225	$::CONN->user_send ($_) for @$bind_cmd;
		226	} elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
		227	$::CONN->user_send ("rotateshoottype +");
		228	} elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
		229	$::CONN->user_send ("rotateshoottype -");
		230	} elsif ($uni == ord '"') {
		231	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		232	$self->{completer}->show;
193	} elsif ($uni == ord "'") {	233	} elsif ($uni == ord "'") {
194	$self->emit ('activate_console');	234	$self->{completer}->set_prefix ("");
195	} elsif ($uni == ord "/") {	235	$self->{completer}->show;
196	$self->emit (activate_console => '/');
197	} elsif (exists $DIR{$sym}) {	236	} elsif (exists $DIR{$sym}) {
198	if ($mod & CFClient::KMOD_SHIFT) {	237	if ($mod & CFClient::KMOD_SHIFT) {
199	$self->{shft}++;	238	$self->{shft}++;
		239	if ($DIR{$sym}[0] != $self->{fire_dir}) {
200	$::CONN->user_send ("fire $DIR{$sym}[0]");	240	$::CONN->user_send ("fire $DIR{$sym}[0]");
		241	}
		242	$self->{fire_dir} = $DIR{$sym}[0];
201	} elsif ($mod & CFClient::KMOD_CTRL) {	243	} elsif ($mod & CFClient::KMOD_CTRL) {
202	$self->{ctrl}++;	244	$self->{ctrl}++;
203	$::CONN->user_send ("run $DIR{$sym}[0]");	245	$::CONN->user_send ("run $DIR{$sym}[0]");
204	} else {	246	} else {
205	$::CONN->user_send ("$DIR{$sym}[1]");	247	$::CONN->user_send ("$DIR{$sym}[1]");
206	}	248	}
207	} elsif ($ev->{unicode}) {	249	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
208	$self->{command_widget} \|\|=
209	new CFClient::MapWidget::Command::
210	command => $self->{command},
211	can_focus => 1,
212	connect_execute => sub {
213	# todo: support callback instead of user_send
214	$::CONN->user_send ($_[1]);
215	},
216	connect_close => sub {
217	(delete $self->{command_widget})->hide;
218	$self->focus_in;
219	},
220	;
221	$self->{command_widget}->key_down ($ev)	250	$self->{completer}->inject_key_down ($ev);
222	unless $ev->{unicode} == 20;
223	return unless $self->{command_widget};
224	$self->{command_widget}->show;	251	$self->{completer}->show;
225	$self->{command_widget}->focus_in;	252	} else {
		253	return 0;
		254	}
		255
226	}	256	1
227	}	257	}
228		258
229	sub key_up {	259	sub invoke_key_up {
230	my ($self, $ev) = @_;	260	my ($self, $ev) = @_;
231		261
		262	my $res = 0;
232	my $mod = $ev->{mod};	263	my $mod = $ev->{mod};
233	my $sym = $ev->{sym};	264	my $sym = $ev->{sym};
234		265
		266	if ($::CFG->{shift_fire_stop}) {
235	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	267	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
236	$::CONN->user_send ("fire_stop");	268	$::CONN->user_send ("fire_stop");
		269	delete $self->{fire_dir};
		270	$res = 1;
		271	}
		272	} else {
		273	if (exists $DIR{$sym} && delete $self->{shft}) {
		274	$::CONN->user_send ("fire_stop");
		275	delete $self->{fire_dir};
		276	$res = 1;
		277	} elsif (($sym == CFClient::SDLK_LSHIFT \|\| $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
		278	$::CONN->user_send ("fire_stop");
		279	delete $self->{fire_dir};
		280	$res = 1;
		281	}
237	}	282	}
		283
238	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	284	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
239	$::CONN->user_send ("run_stop");	285	$::CONN->user_send ("run_stop");
		286	$res = 1;
240	}	287	}
241	}
242		288
243	sub add_command {	289	$res
244	my ($self, $command, $tooltip, $widget, $cb) = @_;
245
246	(my $data = $command) =~ s/\\//g;
247
248	$tooltip =~ s/^\s+//;
249
250	$tooltip = "<big>$data</big>\n\n$tooltip";
251
252	$tooltip =~ s/\s+$//;
253
254	$self->{command}{$command} = [$data, $tooltip, $widget, $cb];
255	}	290	}
256		291
257	sub clr_commands {	292	sub set_magicmap {
		293	my ($self, $w, $h, $x, $y, $data) = @_;
		294
		295	$x -= $::MAP->ox + int 0.5 * $::MAP->w;
		296	$y -= $::MAP->oy + int 0.5 * $::MAP->h;
		297
		298	$self->{magicmap} = [$x, $y, $w, $h, $data];
		299
		300	$self->update;
		301	}
		302
		303	sub draw {
		304	my ($self) = @_;
		305
		306	return unless $::MAP;
		307
		308	my $focused = $CFClient::UI::FOCUS == $self
		309	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
		310
		311	return
		312	unless $focused \|\| !$::FAST;
		313
		314	if (delete $self->{need_update}) {
		315	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
		316
		317	my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
		318	my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
		319
		320	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		321	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		322
		323	my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
		324	my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
		325
		326	if ($::CFG->{fow_enable}) {
		327	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
		328
		329	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
		330	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
		331	glConvolutionFilter2D (
		332	GL_CONVOLUTION_2D,
		333	GL_ALPHA,
		334	3, 3,
		335	GL_ALPHA, GL_FLOAT,
		336	(pack "f*", @{ $self->{smooth_matrix} }),
		337	);
		338	glEnable GL_CONVOLUTION_2D;
		339	}
		340
		341	$self->{fow_texture} = new CFClient::Texture
		342	w => $w,
		343	h => $h,
		344	data => $data,
		345	internalformat => GL_ALPHA,
		346	format => GL_ALPHA;
		347
		348	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		349	} else {
		350	delete $self->{fow_texture};
		351	}
		352
		353	glNewList $self->{list};
		354
		355	glPushMatrix;
		356	glTranslate $sx0, $sy0;
		357	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		358
		359	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
		360
		361	glScale 32, 32;
		362
		363	if (my $tex = $self->{fow_texture}) {
		364	glEnable GL_TEXTURE_2D;
		365	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		366
		367	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		368	$self->{fow_texture}->draw_quad_alpha (0, 0);
		369
		370	glDisable GL_TEXTURE_2D;
		371	}
		372
		373	if ($self->{magicmap}) {
		374	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		375
		376	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
		377	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
		378
		379	glTranslate - $x - 1, - $y - 1;
		380	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		381	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		382	}
		383
		384	glPopMatrix;
		385	glEndList;
		386	}
		387
		388	glCallList $self->{list};
		389
		390	# TNT2 emulates logops in software (or worse :)
		391	unless ($focused) {
		392	glColor 0.4, 0.2, 0.2, 0.6;
		393	glEnable GL_BLEND;
		394	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		395	glBegin GL_QUADS;
		396	glVertex 0, 0;
		397	glVertex 0, $::HEIGHT;
		398	glVertex $::WIDTH, $::HEIGHT;
		399	glVertex $::WIDTH, 0;
		400	glEnd;
		401	glDisable GL_BLEND;
		402	}
		403	}
		404
		405	sub DESTROY {
258	my ($self) = @_;	406	my $self = shift;
259		407
260	%{$self->{command}} = ();	408	glDeleteList $self->{list};
		409
		410	$self->SUPER::DESTROY;
261	}	411	}
262		412
263	package CFClient::MapWidget::MapMap;	413	package CFClient::MapWidget::MapMap;
264		414
265	our @ISA = CFClient::UI::Base::;	415	our @ISA = CFClient::UI::Base::;
…		…
269		419
270	sub size_request {	420	sub size_request {
271	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	421	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
272	}	422	}
273		423
274	sub size_allocate {	424	sub invoke_size_allocate {
275	my ($self, $w, $h) = @_;	425	my ($self, $w, $h) = @_;
276		426
277	$self->SUPER::size_allocate ($w, $h);
278	$self->update;	427	$self->update;
		428
		429	1
279	}	430	}
280		431
281	sub update {	432	sub update {
282	my ($self) = @_;	433	my ($self) = @_;
283		434
…		…
362	CFClient::UI::Label->new (	513	CFClient::UI::Label->new (
363	can_hover => 1,	514	can_hover => 1,
364	can_events => 1,	515	can_events => 1,
365	tooltip_width => 0.33,	516	tooltip_width => 0.33,
366	fontsize => $_,	517	fontsize => $_,
367	), (0.8) x 6	518	), (0.8) x 16
368	];	519	];
369		520
370	$self->{entry} = new CFClient::UI::Entry	521	$self->{entry} = new CFClient::UI::Entry
371	connect_changed => sub {	522	on_changed => sub {
372	$self->update_labels;	523	$self->update_labels;
		524	0
		525	},
		526	on_button_down => sub {
		527	my ($entry, $ev, $x, $y) = @_;
		528
		529	if ($ev->{button} == 3) {
		530	(new CFClient::UI::Menu
		531	items => [
		532	["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key"
		533	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
		534	],
		535	)->popup ($ev);
		536	return 1;
		537	}
		538	0
		539	},
		540	on_key_down => sub {
		541	my ($entry, $ev) = @_;
		542
		543	my $self = $entry->{parent}{parent};
		544
		545	if ($ev->{sym} == 13) {
		546	if (exists $self->{select}) {
		547	$self->{last_command} = $self->{select};
		548	$::CONN->user_send ($self->{select});
		549
		550	unshift @{$self->{history}}, $self->{entry}->get_text;
		551	$self->{hist_ptr} = 0;
		552
		553	$self->hide;
		554	}
		555	} elsif ($ev->{sym} == 27) {
		556	$self->{hist_ptr} = 0;
		557	$self->hide;
		558	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		559	if ($self->{hist_ptr} > 1) {
		560	$self->{hist_ptr}--;
		561	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		562	} elsif ($self->{hist_ptr} > 0) {
		563	$self->{hist_ptr}--;
		564	$self->{entry}->set_text ($self->{hist_saveback});
		565	} else {
		566	++$self->{select_offset}
		567	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		568	}
		569	$self->update_labels;
		570	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		571	if ($self->{select_offset}) {
		572	--$self->{select_offset}
		573	} else {
		574	unless ($self->{hist_ptr}) {
		575	$self->{hist_saveback} = $self->{entry}->get_text;
		576	}
		577	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		578	$self->{hist_ptr}++;
		579	}
		580	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		581	if exists $self->{history}->[$self->{hist_ptr} - 1];
		582	}
		583	$self->update_labels;
		584	} else {
		585	return 0;
		586	}
		587
		588	1
373	};	589	}
		590	;
374		591
375	$self->{vbox}->add (	592	$self->{vbox}->add (
376	$self->{entry},	593	$self->{entry},
377	@{$self->{label}},	594	@{$self->{label}},
378	);	595	);
379		596
380	$self	597	$self
381	}	598	}
382		599
		600	sub set_prefix {
		601	my ($self, $prefix) = @_;
		602
		603	$self->{entry}->set_text ($prefix);
		604	$self->show;
		605	}
		606
383	sub size_allocate {	607	sub invoke_size_allocate {
384	my ($self, $w, $h) = @_;	608	my ($self, $w, $h) = @_;
385		609
386	$self->SUPER::size_allocate ($w, $h);
387	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	610	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
388	}
389		611
		612	$self->SUPER::invoke_size_allocate ($w, $h)
		613	}
		614
		615	sub show {
		616	my ($self) = @_;
		617
		618	$self->SUPER::show;
		619	$self->{entry}->grab_focus;
		620	}
		621
		622	sub hide {
		623	my ($self) = @_;
		624
		625	$self->{hist_ptr} = 0;
		626
		627	$self->SUPER::hide;
		628	$self->{entry}->set_text ("");
		629	}
		630
390	sub key_down {	631	sub inject_key_down {
391	my ($self, $ev) = @_;	632	my ($self, $ev) = @_;
392		633
393	if ($ev->{sym} == 13) {	634	$self->{entry}->grab_focus;
394	if (exists $self->{select}) {
395	$self->emit (execute => $self->{select});
396	$self->emit ("close");
397	}
398	} elsif ($ev->{sym} == 27) {
399	$self->{entry}->set_text ("");
400	$self->emit ("close");
401	return;
402	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
403	++$self->{select_offset}
404	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
405	$self->update_labels;
406	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
407	--$self->{select_offset}
408	if $self->{select_offset};
409	$self->update_labels;
410	} else {
411	#$self->{entry}{force_alloc} = 1;
412	$self->{entry}->key_down ($ev);	635	$self->{entry}->emit (key_down => $ev);
413	}
414	}	636	}
415		637
416	sub update_labels {	638	sub update_labels {
417	my ($self) = @_;	639	my ($self) = @_;
418		640
419	my $text = $self->{entry}->get_text;	641	my $text = $self->{entry}->get_text;
420		642
421	length $text	643	length $text
422	or return $self->emit ("close");	644	or return $self->hide;
423		645
424	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;	646	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
425		647
426	if ($cmd ne $self->{last_search}) {	648	if ($text ne $self->{last_search}) {
427	my $regexp = do {
428	my ($beg, @chr) = split //, lc $cmd;
429
430	# the following regex is used to match our "completion entry"
431	# to an actual command - the parentheses match kind of "overhead"
432	# - the more characters the parentheses match, the less attractive
433	# is the match.
434	my $regexp = "^\Q$beg\E"
435	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
436	qr<$regexp>
437	};
438
439	my @match;	649	my @match;
		650
		651	if ($text =~ /^(.*?)\s+$/) {
		652	@match = [$cmd, "(appended whitespace suppresses completion)"];
		653	} else {
		654	my $regexp = do {
		655	my ($beg, @chr) = split //, lc $cmd;
		656
		657	# the following regex is used to match our "completion entry"
		658	# to an actual command - the parentheses match kind of "overhead"
		659	# - the more characters the parentheses match, the less attractive
		660	# is the match.
		661	my $regexp = "^\Q$beg\E"
		662	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		663	qr<$regexp>
		664	};
		665
440	my @penalty;	666	my @penalty;
441		667
442	for (keys %{$self->{command}}) {	668	for (keys %{$self->{command}}) {
443	if (@penalty = $_ =~ $regexp) {	669	if (@penalty = $_ =~ $regexp) {
444	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	670	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		671	}
445	}	672	}
446	}
447		673
448	@match = map $self->{command}{$_->[0]},	674	@match = map $self->{command}{$_->[0]},
449	sort {	675	sort {
450	$a->[1] <=> $b->[1]	676	$a->[1] <=> $b->[1]
451	or (length $a->[0]) <=> (length $b->[0])	677	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		678	or (length $b->[0]) <=> (length $a->[0])
452	} @match;	679	} @match;
		680	}
453		681
454	$self->{last_search} = $cmd;	682	$self->{last_search} = $text;
455	$self->{last_match} = \@match;	683	$self->{last_match} = \@match;
456		684
457	$self->{select_offset} = 0;	685	$self->{select_offset} = 0;
458	}	686	}
459		687
…		…
499	$label->set_text ("");	727	$label->set_text ("");
500	$label->set_tooltip ("");	728	$label->set_tooltip ("");
501	}	729	}
502		730
503	$self->update;	731	$self->update;
504	###
505	}	732	}
506		733
507	sub _draw {	734	sub _draw {
508	my ($self) = @_;	735	my ($self) = @_;
509		736

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.78 by root, Sun Jul 23 16:11:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.78 by root, Sun Jul 23 16:11:12 2006 UTC