[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.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	$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	}
22		34
23	sub DESTROY {	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
		47	$self
		48	}
		49
		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 {
24	my $self = shift;	63	my ($self) = @_;
25		64
26	glDeleteList $self->{list};	65	%{$self->{completer}{command}} = ();
27		66
28	$self->SUPER::DESTROY;	67	$self->{completer}->hide
		68	if $self->{completer};
29	}	69	}
30		70
31	sub button_down {	71	sub invoke_button_down {
32	my ($self, $ev, $x, $y) = @_;	72	my ($self, $ev, $x, $y) = @_;
33		73
34	$self->focus_in;
35
36	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
37	my ($ox, $oy) = ($ev->{x}, $ev->{y});	91	my ($ox, $oy) = ($ev->{x}, $ev->{y});
38	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	92	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
39		93
40	$self->{motion} = sub {	94	$self->{motion} = sub {
41	my ($ev, $x, $y) = @_;	95	my ($ev, $x, $y) = @_;
…		…
45	$::CFG->{map_shift_x} = $bw + $x - $ox;	99	$::CFG->{map_shift_x} = $bw + $x - $ox;
46	$::CFG->{map_shift_y} = $bh + $y - $oy;	100	$::CFG->{map_shift_y} = $bh + $y - $oy;
47		101
48	$self->update;	102	$self->update;
49	};	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
50	}	124	1
51	}	125	}
52		126
53	sub button_up {	127	sub invoke_button_up {
54	my ($self, $ev, $x, $y) = @_;	128	my ($self, $ev, $x, $y) = @_;
55		129
56	delete $self->{motion};	130	delete $self->{motion};
57	}
58		131
		132	1
		133	}
		134
59	sub mouse_motion {	135	sub invoke_mouse_motion {
60	my ($self, $ev, $x, $y) = @_;	136	my ($self, $ev, $x, $y) = @_;
61		137
		138	if ($self->{motion}) {
62	$self->{motion}->($ev, $x, $y) if $self->{motion};	139	$self->{motion}->($ev, $x, $y);
		140	} else {
		141	return 0;
		142	}
		143
		144	1
63	}	145	}
64		146
65	sub size_request {	147	sub size_request {
66	(	148	(
67	1 + 32 * int $::WIDTH / 32,	149	32 * CFClient::ceil $::WIDTH / 32,
68	1 + 32 * int $::HEIGHT / 32,	150	32 * CFClient::ceil $::HEIGHT / 32,
69	)	151	)
70	}	152	}
71		153
72	sub update {	154	sub update {
73	my ($self) = @_;	155	my ($self) = @_;
74		156
75	$self->{need_update} = 1;	157	$self->{need_update} = 1;
76	$self->SUPER::update;	158	$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	}	159	}
198		160
199	my %DIR = (	161	my %DIR = (
200	CFClient::SDLK_KP8, [1, "north"],	162	CFClient::SDLK_KP8, [1, "north"],
201	CFClient::SDLK_KP9, [2, "northeast"],	163	CFClient::SDLK_KP9, [2, "northeast"],
…		…
210	CFClient::SDLK_RIGHT, [3, "east"],	172	CFClient::SDLK_RIGHT, [3, "east"],
211	CFClient::SDLK_DOWN, [5, "south"],	173	CFClient::SDLK_DOWN, [5, "south"],
212	CFClient::SDLK_LEFT, [7, "west"],	174	CFClient::SDLK_LEFT, [7, "west"],
213	);	175	);
214		176
215	sub key_down {	177	sub invoke_key_down {
216	my ($self, $ev) = @_;	178	my ($self, $ev) = @_;
217		179
218	my $mod = $ev->{mod};	180	my $mod = $ev->{mod};
219	my $sym = $ev->{sym};	181	my $sym = $ev->{sym};
		182	my $uni = $ev->{unicode};
220		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
221	if ($sym == CFClient::SDLK_KP5) {	215	} elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
222	$::CONN->user_send ("stay fire");	216	$::CONN->user_send ("stay fire");
223	} elsif ($sym == ord ",") {	217	} elsif ($uni == ord ",") {
224	$::CONN->user_send ("take");	218	$::CONN->user_send ("take");
225	} elsif ($sym == ord "a") {	219	} elsif ($uni == ord " ") {
226	$::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;
227	} elsif ($sym == ord "'") {	233	} elsif ($uni == ord "'") {
228	$self->emit ('activate_console');	234	$self->{completer}->set_prefix ("");
229	} elsif ($sym == ord "/") {	235	$self->{completer}->show;
230	$self->emit (activate_console => '/');
231	} elsif (exists $DIR{$sym}) {	236	} elsif (exists $DIR{$sym}) {
232	if ($mod & CFClient::KMOD_SHIFT) {	237	if ($mod & CFClient::KMOD_SHIFT) {
233	$self->{shft}++;	238	$self->{shft}++;
		239	if ($DIR{$sym}[0] != $self->{fire_dir}) {
234	$::CONN->user_send ("fire $DIR{$sym}[0]");	240	$::CONN->user_send ("fire $DIR{$sym}[0]");
		241	}
		242	$self->{fire_dir} = $DIR{$sym}[0];
235	} elsif ($mod & CFClient::KMOD_CTRL) {	243	} elsif ($mod & CFClient::KMOD_CTRL) {
236	$self->{ctrl}++;	244	$self->{ctrl}++;
237	$::CONN->user_send ("run $DIR{$sym}[0]");	245	$::CONN->user_send ("run $DIR{$sym}[0]");
238	} else {	246	} else {
239	$::CONN->user_send ("$DIR{$sym}[1]");	247	$::CONN->user_send ("$DIR{$sym}[1]");
240	}	248	}
241	} elsif ($ev->{unicode}) {	249	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
242	$self->{command_widget} \|\|=
243	new CFClient::MapWidget::Command::
244	command => $self->{command},
245	can_focus => 1,
246	connect_execute => sub {
247	# todo: support callback instead of user_send
248	$::CONN->user_send ($_[1][1]);
249	},
250	connect_close => sub {
251	(delete $self->{command_widget})->hide;
252	$self->focus_in;
253	},
254	;
255	$self->{command_widget}->key_down ($ev);	250	$self->{completer}->inject_key_down ($ev);
256	return unless $self->{command_widget};
257	$self->{command_widget}->show;	251	$self->{completer}->show;
258	$self->{command_widget}->focus_in;	252	} else {
		253	return 0;
		254	}
		255
259	}	256	1
260	}	257	}
261		258
262	sub key_up {	259	sub invoke_key_up {
263	my ($self, $ev) = @_;	260	my ($self, $ev) = @_;
264		261
		262	my $res = 0;
265	my $mod = $ev->{mod};	263	my $mod = $ev->{mod};
266	my $sym = $ev->{sym};	264	my $sym = $ev->{sym};
267		265
		266	if ($::CFG->{shift_fire_stop}) {
268	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	267	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269	$::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	}
270	}	282	}
		283
271	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	284	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272	$::CONN->user_send ("run_stop");	285	$::CONN->user_send ("run_stop");
		286	$res = 1;
		287	}
		288
		289	$res
		290	}
		291
		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 {
		406	my $self = shift;
		407
		408	glDeleteList $self->{list};
		409
		410	$self->SUPER::DESTROY;
		411	}
		412
		413	package CFClient::MapWidget::MapMap;
		414
		415	our @ISA = CFClient::UI::Base::;
		416
		417	use Time::HiRes qw(time);
		418	use CFClient::OpenGL;
		419
		420	sub size_request {
		421	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		422	}
		423
		424	sub invoke_size_allocate {
		425	my ($self, $w, $h) = @_;
		426
		427	$self->update;
		428
		429	1
		430	}
		431
		432	sub update {
		433	my ($self) = @_;
		434
		435	delete $self->{texture_atime};
		436	$self->SUPER::update;
		437	}
		438
		439	sub _draw {
		440	my ($self) = @_;
		441
		442	$::MAP or return;
		443
		444	my ($w, $h) = @$self{qw(w h)};
		445
		446	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		447	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		448
		449	my $sx = int $::CFG->{map_shift_x} / 32;
		450	my $sy = int $::CFG->{map_shift_y} / 32;
		451
		452	my $ox = 0.5 * ($w - $sw);
		453	my $oy = 0.5 * ($h - $sh);
		454
		455	glEnable GL_BLEND;
		456	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		457	glEnable GL_TEXTURE_2D;
		458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		459
		460	if ($self->{texture_atime} < time) {
		461	$self->{texture_atime} = time + 1/3;
		462
		463	$self->{texture} =
		464	new CFClient::Texture
		465	w => $w,
		466	h => $h,
		467	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		468	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		469	}
		470
		471	$self->{texture}->draw_quad (0, 0);
		472
		473	glDisable GL_TEXTURE_2D;
		474
		475	glTranslate 0.375, 0.375;
		476
		477	#TODO: map scale is completely borked
		478
		479	my $x0 = int $ox - $sx + 0.5;
		480	my $y0 = int $oy - $sy + 0.5;
		481
		482	glColor 1, 1, 0, 1;
		483	glBegin GL_LINE_LOOP;
		484	glVertex $x0 , $y0 ;
		485	glVertex $x0 , $y0 + $sh;
		486	glVertex $x0 + $sw, $y0 + $sh;
		487	glVertex $x0 + $sw, $y0 ;
		488	glEnd;
273	}	489
274	}	490	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	}	491	}
283		492
284	package CFClient::MapWidget::Command;	493	package CFClient::MapWidget::Command;
285		494
286	use strict;	495	use strict;
287		496
288	use CFClient::OpenGL;	497	use CFClient::OpenGL;
289		498
290	our @ISA = CFClient::UI::VBox::;	499	our @ISA = CFClient::UI::Frame::;
291		500
292	sub new {	501	sub new {
293	my $class = shift;	502	my $class = shift;
294		503
295	my $self = $class->SUPER::new (	504	my $self = $class->SUPER::new (
		505	bg => [0, 0, 0, 0.8],
296	@_,	506	@_,
297	children => [map	507	);
		508
		509	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		510
		511	$self->{label} = [
		512	map
298	CFClient::UI::Label->new (	513	CFClient::UI::Label->new (
299	can_hover => 1,	514	can_hover => 1,
300	can_events => 1,	515	can_events => 1,
		516	tooltip_width => 0.33,
301	fontsize => $_,	517	fontsize => $_,
302	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8	518	), (0.8) x 16
		519	];
		520
		521	$self->{entry} = new CFClient::UI::Entry
		522	on_changed => sub {
		523	$self->update_labels;
		524	0
303	],	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
		589	}
		590	;
		591
		592	$self->{vbox}->add (
		593	$self->{entry},
		594	@{$self->{label}},
304	);	595	);
305		596
306	$self	597	$self
307	}	598	}
308		599
		600	sub set_prefix {
		601	my ($self, $prefix) = @_;
		602
		603	$self->{entry}->set_text ($prefix);
		604	$self->show;
		605	}
		606
309	sub size_allocate {	607	sub invoke_size_allocate {
310	my ($self, $w, $h) = @_;	608	my ($self, $w, $h) = @_;
311		609
312	$self->SUPER::size_allocate ($w, $h);
313	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	610	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		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
		631	sub inject_key_down {
		632	my ($self, $ev) = @_;
		633
		634	$self->{entry}->grab_focus;
		635	$self->{entry}->emit (key_down => $ev);
314	}	636	}
315		637
316	sub update_labels {	638	sub update_labels {
317	my ($self) = @_;	639	my ($self) = @_;
318		640
319	my $command = $self->{command};	641	my $text = $self->{entry}->get_text;
320	my $search_abbrev = qr/^\Q$self->{search}/;
321	my $search_full = qr/\Q$self->{search}/;
322		642
323	my @found;	643	length $text
		644	or return $self->hide;
324		645
325	for (@$command) {	646	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
326	if ($_->[0] =~ $search_abbrev) {	647
327	push @found, [$_->[0], $_];	648	if ($text ne $self->{last_search}) {
328	} elsif ($_->[1] =~ $search_full) {	649	my @match;
329	push @found, [$_->[1], $_];	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
		666	my @penalty;
		667
		668	for (keys %{$self->{command}}) {
		669	if (@penalty = $_ =~ $regexp) {
		670	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		671	}
330	}	672	}
331	}
332		673
333	@found = sort { $a->[0] cmp $b->[0] } @found;	674	@match = map $self->{command}{$_->[0]},
		675	sort {
		676	$a->[1] <=> $b->[1]
		677	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		678	or (length $b->[0]) <=> (length $a->[0])
		679	} @match;
		680	}
334		681
335	$self->{children}[0]->set_text ("$self->{search}_");	682	$self->{last_search} = $text;
		683	$self->{last_match} = \@match;
336		684
337	for (0..5) {	685	$self->{select_offset} = 0;
338	$self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
339	$self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
340	}	686	}
341		687
342	$self->{select} = $found[0][1]	688	my @labels = @{ $self->{label} };
343	if @found;	689	my @matches = @{ $self->{last_match} \|\| [] };
344		690
345	if (@found > 6) {	691	if ($self->{select_offset}) {
346	$self->{children}[6]->set_text ("...");	692	splice @matches, 0, $self->{select_offset}, ();
347	}
348		693
349	$self->check_size;	694	my $label = shift @labels;
350	}	695	$label->set_text ("...");
		696	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		697	}
351		698
352	sub key_down {	699	for my $label (@labels) {
		700	$label->{fg} = [1, 1, 1, 1];
		701	$label->{bg} = [0, 0, 0, 0];
		702	}
		703
		704	if (@matches) {
		705	$self->{select} = "$matches[0][0]$arg";
		706
		707	$labels[0]->{fg} = [0, 0, 0, 1];
		708	$labels[0]->{bg} = [1, 1, 1, 0.8];
		709	} else {
		710	$self->{select} = "$cmd$arg";
		711	}
		712
		713	for my $match (@matches) {
		714	my $label = shift @labels;
		715
		716	if (@labels) {
		717	$label->set_text ("$match->[0]$arg");
		718	$label->set_tooltip ($match->[1]);
		719	} else {
		720	$label->set_text ("...");
		721	$label->set_tooltip ("Use Cursor-Down to view more matches");
		722	last;
		723	}
		724	}
		725
		726	for my $label (@labels) {
		727	$label->set_text ("");
		728	$label->set_tooltip ("");
		729	}
		730
		731	$self->update;
		732	}
		733
		734	sub _draw {
353	my ($self, $ev) = @_;	735	my ($self) = @_;
354		736
355	if ($ev->{sym} == 8) {	737	# hack
356	substr $self->{search}, -1, 1, "";	738	local $CFClient::UI::FOCUS = $self->{entry};
357	$self->update_labels;
358	} elsif ($ev->{sym} == 13) {
359	if (exists $self->{select}) {
360	$self->emit (execute => $self->{select});
361	$self->emit ("close");
362	}
363	} elsif ($ev->{sym} == 27) {
364	$self->emit ("close");
365	return;
366	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
367	$self->{search} .= chr $ev->{unicode};
368	$self->update_labels;
369	}
370		739
371	length $self->{search}	740	$self->SUPER::_draw;
372	or $self->emit ("close");
373	}	741	}
374		742
375	1	743	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.78 by root, Sun Jul 23 16:11:12 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.78 by root, Sun Jul 23 16:11:12 2006 UTC