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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC

…		…
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
8	use CFPlus;	8	use CFPlus;
9	use CFPlus::OpenGL;	9	use CFPlus::OpenGL;
10	use CFPlus::UI;	10	use CFPlus::UI;
		11	use CFPlus::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = CFPlus::UI::Base::;
13		14
14	my $magicmap_tex =	15	my $magicmap_tex =
15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	16	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
…		…
20		21
21	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
22	z => -1,	23	z => -1,
23	can_focus => 1,	24	can_focus => 1,
24	list => glGenList,	25	list => glGenList,
		26	tilesize => 32,
25		27
26	smooth_matrix => [	28	smooth_matrix => [
27	0.05, 0.13, 0.05,	29	0.30, 0.50, 0.30,
28	0.13, 0.30, 0.13,
29	0.05, 0.13, 0.05,	30	0.50, 0.50, 0.50,
		31	0.30, 0.50, 0.30,
30	],	32	],
31		33
32	@_	34	@_
33	);	35	);
34		36
…		…
36	command => $self->{command},	38	command => $self->{command},
37	tooltip => "#completer_help",	39	tooltip => "#completer_help",
38	;	40	;
39		41
40	$self	42	$self
		43	}
		44
		45	sub set_tilesize {
		46	my ($self, $tilesize) = @_;
		47
		48	$self->{tilesize} = $tilesize;
41	}	49	}
42		50
43	sub add_command {	51	sub add_command {
44	my ($self, $command, $tooltip, $widget, $cb) = @_;	52	my ($self, $command, $tooltip, $widget, $cb) = @_;
45		53
…		…
176		184
177	if ($ev->{button} == 1) {	185	if ($ev->{button} == 1) {
178	$self->grab_focus;	186	$self->grab_focus;
179	return unless $::CONN;	187	return unless $::CONN;
180		188
181	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};	189	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
182	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};	190	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
183		191
184	$x -= CFPlus::floor $::MAP->w * 0.5;	192	$x -= CFPlus::floor $::MAP->w * 0.5;
185	$y -= CFPlus::floor $::MAP->h * 0.5;	193	$y -= CFPlus::floor $::MAP->h * 0.5;
186		194
		195	if ($::CONN) {
		196	if ($::IN_BUILD_MODE) {
		197	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
		198	} else {
187	$::CONN->lookat ($x, $y)	199	$::CONN->lookat ($x, $y)
188	if $::CONN;	200	}
		201	}
189		202
190	} elsif ($ev->{button} == 2) {	203	} elsif ($ev->{button} == 2) {
191	$self->grab_focus;	204	$self->grab_focus;
192	return unless $::CONN;	205	return unless $::CONN;
193		206
…		…
279		292
280	1	293	1
281	}	294	}
282		295
283	sub size_request {	296	sub size_request {
		297	my ($self) = @_;
		298
284	(	299	(
285	32 * CFPlus::ceil $::WIDTH / 32,	300	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
286	32 * CFPlus::ceil $::HEIGHT / 32,	301	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
287	)	302	)
288	}	303	}
289		304
290	sub update {	305	sub update {
291	my ($self) = @_;	306	my ($self) = @_;
…		…
293	$self->{need_update} = 1;	308	$self->{need_update} = 1;
294	$self->SUPER::update;	309	$self->SUPER::update;
295	}	310	}
296		311
297	my %DIR = (	312	my %DIR = (
		313	CFPlus::SDLK_KP5, [0, "stay fire"],
298	CFPlus::SDLK_KP8, [1, "north"],	314	CFPlus::SDLK_KP8, [1, "north"],
299	CFPlus::SDLK_KP9, [2, "northeast"],	315	CFPlus::SDLK_KP9, [2, "northeast"],
300	CFPlus::SDLK_KP6, [3, "east"],	316	CFPlus::SDLK_KP6, [3, "east"],
301	CFPlus::SDLK_KP3, [4, "southeast"],	317	CFPlus::SDLK_KP3, [4, "southeast"],
302	CFPlus::SDLK_KP2, [5, "south"],	318	CFPlus::SDLK_KP2, [5, "south"],
…		…
317	my $sym = $ev->{sym};	333	my $sym = $ev->{sym};
318	my $uni = $ev->{unicode};	334	my $uni = $ev->{unicode};
319		335
320	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	336	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
321		337
322	if ($uni == ord "\t") {	338	if ($sym == 9) {
323	$::PL_WINDOW->toggle_visibility;	339	($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
324	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	340	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
325	$::HELP_WINDOW->toggle_visibility;	341	$::HELP_WINDOW->toggle_visibility;
326	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {	342	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
327	::toggle_player_page ($::STATS_PAGE);	343	::toggle_player_page ($::STATS_PAGE);
328	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {	344	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
…		…
331	::toggle_player_page ($::SPELL_PAGE);	347	::toggle_player_page ($::SPELL_PAGE);
332	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {	348	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
333	::toggle_player_page ($::INVENTORY_PAGE);	349	::toggle_player_page ($::INVENTORY_PAGE);
334	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {	350	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
335	$::SETUP_DIALOG->toggle_visibility;	351	$::SETUP_DIALOG->toggle_visibility;
336	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
337	$::BIND_EDITOR->set_binding (undef, undef, [],
338	sub {
339	my ($mod, $sym, $cmds) = @_;
340	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
341	});
342	$::BIND_EDITOR->start;
343	$::BIND_EDITOR->show;
344	#TODO: elmex, what was this supposed to do? it currently crashes the client.
345	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
346	# $::BIND_EDITOR->stop;
347	# $::BIND_EDITOR->ask_for_bind_and_commit;
348	# $::BIND_EDITOR->hide;
349	} elsif (!$::CONN) {	352	} elsif (!$::CONN) {
350	return 0; # bindings further down need a valid connection	353	return 0; # bindings further down need a valid connection
351		354
352	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
353	$::CONN->user_send ("stay fire");
354	} elsif ($uni == ord ",") {	355	} elsif ($uni == ord ",") {
355	$::CONN->user_send ("take");	356	$::CONN->user_send ("take");
356	} elsif ($uni == ord " ") {	357	} elsif ($uni == ord " ") {
357	$::CONN->user_send ("apply");	358	$::CONN->user_send ("apply");
358	} elsif ($uni == 13) {	359	} elsif ($uni == 13) {
359	$::CONN->user_send ("examine");	360	$::CONN->user_send ("examine");
360	} elsif ($uni == ord ".") {	361	} elsif ($uni == ord ".") {
361	$::CONN->user_send ($self->{completer}{last_command})	362	$::CONN->user_send ($self->{completer}{last_command})
362	if exists $self->{completer}{last_command};	363	if exists $self->{completer}{last_command};
363	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {	364	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
364	$::CONN->user_send ($_) for @$bind_cmd;	365	$::CONN->macro_send ($_) for @macros;
365	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {	366	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
366	$::CONN->user_send ("rotateshoottype +");	367	$::CONN->user_send ("rotateshoottype +");
367	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {	368	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
368	$::CONN->user_send ("rotateshoottype -");	369	$::CONN->user_send ("rotateshoottype -");
		370	} elsif ($uni == ord '!') {
		371	$self->{completer}->set_prefix ("shout ");
		372	$self->{completer}->show;
369	} elsif ($uni == ord '"') {	373	} elsif ($uni == ord '"') {
370	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	374	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
371	$self->{completer}->show;	375	$self->{completer}->show;
372	} elsif ($uni == ord "'") {	376	} elsif ($uni == ord "'") {
373	$self->{completer}->set_prefix ("");	377	$self->{completer}->set_prefix ("");
…		…
426	}	430	}
427		431
428	$res	432	$res
429	}	433	}
430		434
		435	sub invoke_visibility_change {
		436	my ($self) = @_;
		437
		438	$self->refresh_hook;
		439
		440	0
		441	}
		442
431	sub set_magicmap {	443	sub set_magicmap {
432	my ($self, $w, $h, $x, $y, $data) = @_;	444	my ($self, $w, $h, $x, $y, $data) = @_;
433		445
434	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	446	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
435	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	447	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
437	$self->{magicmap} = [$x, $y, $w, $h, $data];	449	$self->{magicmap} = [$x, $y, $w, $h, $data];
438		450
439	$self->update;	451	$self->update;
440	}	452	}
441		453
442	sub draw {	454	sub refresh_hook {
443	my ($self) = @_;	455	my ($self) = @_;
444		456
445	return unless $::MAP;	457	return unless $::MAP;
446		458
447	my $focused = $CFPlus::UI::FOCUS == $self
448	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
449
450	return
451	unless $focused \|\| !$::FAST;
452
453	if (delete $self->{need_update}) {	459	if (delete $self->{need_update}) {
454	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	460	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
455		461
456	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	462	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
457	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	463	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
458		464
459	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	465	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
…		…
464		470
465	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;	471	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
466	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;	472	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
467		473
468	if ($::CFG->{fow_enable}) {	474	if ($::CFG->{fow_enable}) {
469	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);	475	my ($w, $h, $data) = $::MAP->fow_texture (
470		476	$dx, $dy, $sw, $sh,
471	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	477	$::CFG->{fow_smooth},
472	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
473	glConvolutionFilter2D (
474	GL_CONVOLUTION_2D,
475	GL_ALPHA,
476	3, 3,
477	GL_ALPHA, GL_FLOAT,
478	(pack "f*", @{ $self->{smooth_matrix} }),	478	pack "f*", @{ $self->{smooth_matrix} },
479	);	479	);
480	glEnable GL_CONVOLUTION_2D;
481	}
482		480
483	$self->{fow_texture} = new CFPlus::Texture	481	$self->{fow_texture} = new CFPlus::Texture
484	w => $w,	482	w => $w,
485	h => $h,	483	h => $h,
486	data => $data,	484	data => $data,
487	internalformat => GL_ALPHA,	485	internalformat => GL_ALPHA,
488	format => GL_ALPHA;	486	format => GL_ALPHA;
489
490	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
491	} else {	487	} else {
492	delete $self->{fow_texture};	488	delete $self->{fow_texture};
493	}	489	}
494		490
495	glNewList $self->{list};	491	glNewList $self->{list};
496		492
497	glPushMatrix;	493	glPushMatrix;
498	glTranslate $sx0, $sy0;	494	glTranslate $sx0, $sy0;
499	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	495	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
500		496
501	$::MAP->draw ($dx, $dy, $sw, $sh);	497	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
502		498
503	glScale 32, 32;	499	glScale $self->{tilesize}, $self->{tilesize};
504		500
505	if (my $tex = $self->{fow_texture}) {	501	if (my $tex = $self->{fow_texture}) {
		502	glPushMatrix;
		503	#glScale 1/3, 1/3 if $::CFG->{fow_smooth};
506	glEnable GL_TEXTURE_2D;	504	glEnable GL_TEXTURE_2D;
507	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	505	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
508		506
509	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	507	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
510	$self->{fow_texture}->draw_quad_alpha (0, 0);	508	$self->{fow_texture}->draw_quad_alpha (0, 0);
511		509
512	glDisable GL_TEXTURE_2D;	510	glDisable GL_TEXTURE_2D;
		511	glPopMatrix;
513	}	512	}
514		513
515	if ($self->{magicmap}) {	514	if ($self->{magicmap}) {
516	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	515	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
517		516
…		…
524	}	523	}
525		524
526	glPopMatrix;	525	glPopMatrix;
527	glEndList;	526	glEndList;
528	}	527	}
		528
		529	}
		530
		531	sub draw {
		532	my ($self) = @_;
		533
		534	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		535
		536	return unless $self->{list};
		537
		538	my $focused = $CFPlus::UI::FOCUS == $self
		539	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		540
		541	return
		542	unless $focused \|\| !$::FAST;
529		543
530	glCallList $self->{list};	544	glCallList $self->{list};
531		545
532	# TNT2 emulates logops in software (or worse :)	546	# TNT2 emulates logops in software (or worse :)
533	unless ($focused) {	547	unless ($focused) {
…		…
552	$self->SUPER::DESTROY;	566	$self->SUPER::DESTROY;
553	}	567	}
554		568
555	package CFPlus::MapWidget::MapMap;	569	package CFPlus::MapWidget::MapMap;
556		570
		571	use strict;
		572	use utf8;
		573
557	our @ISA = CFPlus::UI::Base::;	574	our @ISA = CFPlus::UI::Base::;
558		575
559	use Time::HiRes qw(time);	576	use Time::HiRes qw(time);
560	use CFPlus::OpenGL;	577	use CFPlus::OpenGL;
561		578
562	sub size_request {	579	sub size_request {
563	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	580	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
564	}	581	}
565		582
566	sub invoke_size_allocate {	583	sub refresh_hook {
567	my ($self, $w, $h) = @_;	584	my ($self) = @_;
568		585
569	$self->update;	586	if ($::MAP && $self->{texture_atime} < time) {
570
571	1
572	}
573
574	sub update {
575	my ($self) = @_;
576
577	delete $self->{texture_atime};
578	$self->SUPER::update;
579	}
580
581	sub _draw {
582	my ($self) = @_;
583
584	$::MAP or return;
585
586	my ($w, $h) = @$self{qw(w h)};	587	my ($w, $h) = @$self{qw(w h)};
587		588
588	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	589	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
589	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	590	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
590		591
591	my $sx = int $::CFG->{map_shift_x} / 32;
592	my $sy = int $::CFG->{map_shift_y} / 32;
593
594	my $ox = 0.5 * ($w - $sw);	592	my $ox = 0.5 * ($w - $sw);
595	my $oy = 0.5 * ($h - $sh);	593	my $oy = 0.5 * ($h - $sh);
596		594
597	glEnable GL_BLEND;	595	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
599	glEnable GL_TEXTURE_2D;
600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
601		597
602	if ($self->{texture_atime} < time) {	598	#TODO: map scale is completely borked
		599
		600	my $x0 = int $ox - $sx + 0.5;
		601	my $y0 = int $oy - $sy + 0.5;
		602
		603	$self->{sw} = $sw;
		604	$self->{sh} = $sh;
		605
		606	$self->{x0} = $x0;
		607	$self->{y0} = $y0;
		608
603	$self->{texture_atime} = time + 1/3;	609	$self->{texture_atime} = time + 1/3;
604		610
605	$self->{texture} =	611	$self->{texture} =
606	new CFPlus::Texture	612	new CFPlus::Texture
607	w => $w,	613	w => $w,
608	h => $h,	614	h => $h,
609	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	615	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
610	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;	616	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
611	}	617	}
		618	}
		619
		620	sub invoke_visibility_change {
		621	my ($self) = @_;
		622
		623	$self->refresh_hook;
		624
		625	0
		626	}
		627
		628	sub invoke_size_allocate {
		629	my ($self, $w, $h) = @_;
		630
		631	$self->update;
		632
		633	1
		634	}
		635
		636	sub update {
		637	my ($self) = @_;
		638
		639	delete $self->{texture_atime};
		640	$self->SUPER::update;
		641	}
		642
		643	sub _draw {
		644	my ($self) = @_;
		645
		646	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		647
		648	$self->{texture} or return;
		649
		650	glEnable GL_BLEND;
		651	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		652	glEnable GL_TEXTURE_2D;
		653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
612		654
613	$self->{texture}->draw_quad (0, 0);	655	$self->{texture}->draw_quad (0, 0);
614		656
615	glDisable GL_TEXTURE_2D;	657	glDisable GL_TEXTURE_2D;
616		658
617	glTranslate 0.375, 0.375;	659	glTranslate 0.375, 0.375;
618
619	#TODO: map scale is completely borked
620
621	my $x0 = int $ox - $sx + 0.5;
622	my $y0 = int $oy - $sy + 0.5;
623		660
624	glColor 1, 1, 0, 1;	661	glColor 1, 1, 0, 1;
625	glBegin GL_LINE_LOOP;	662	glBegin GL_LINE_LOOP;
626	glVertex $x0 , $y0 ;	663	glVertex $self->{x0} , $self->{y0} ;
627	glVertex $x0 , $y0 + $sh;	664	glVertex $self->{x0} , $self->{y0} + $self->{sh};
628	glVertex $x0 + $sw, $y0 + $sh;	665	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
629	glVertex $x0 + $sw, $y0 ;	666	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
630	glEnd;	667	glEnd;
631		668
632	glDisable GL_BLEND;	669	glDisable GL_BLEND;
633	}	670	}
634		671
…		…
670		707
671	if ($ev->{button} == 3) {	708	if ($ev->{button} == 3) {
672	(new CFPlus::UI::Menu	709	(new CFPlus::UI::Menu
673	items => [	710	items => [
674	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	711	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
675	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	712	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
676	],	713	],
677	)->popup ($ev);	714	)->popup ($ev);
678	return 1;	715	return 1;
679	}	716	}
680	0	717	0

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC vs. Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC