[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.111 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.126 by root, Sat Nov 18 18:19:05 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
		3	my $startup_done = sub { };
		4
		5	# do splash-screen thingy on win32
		6	BEGIN {
		7	if (%PAR::LibCache && $^O eq "MSWin32") {
		8	while (my ($filename, $zip) = each %PAR::LibCache) {
		9	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
		10	}
		11
		12	require Win32::GUI::SplashScreen;
		13
		14	Win32::GUI::SplashScreen::Show (
		15	-file => "$ENV{PAR_TEMP}/SPLASH.bmp",
		16	);
		17
		18	$startup_done = sub {
		19	Win32::GUI::SplashScreen::Done (1);
		20	};
		21	}
		22	}
2		23
3	use strict;	24	use strict;
4	use utf8;	25	use utf8;
5		26
6	# do things only needed for single-binary version (par)	27	# do things only needed for single-binary version (par)
8	if (%PAR::LibCache) {	29	if (%PAR::LibCache) {
9	@INC = grep ref, @INC; # weed out all paths except pars loader refs	30	@INC = grep ref, @INC; # weed out all paths except pars loader refs
10		31
11	while (my ($filename, $zip) = each %PAR::LibCache) {	32	while (my ($filename, $zip) = each %PAR::LibCache) {
12	for ($zip->memberNames) {	33	for ($zip->memberNames) {
13	next unless /^\/root\/(.*)/;	34	next unless /^root\/(.*)/;
14	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	35	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15	unless -e "$ENV{PAR_TEMP}/$1";	36	unless -e "$ENV{PAR_TEMP}/$1";
16	}	37	}
17	}	38	}
18		39
…		…
47		68
48	$Event::Eval = 0;	69	$Event::Eval = 0;
49	$Event::DIED = sub {	70	$Event::DIED = sub {
50	# TODO: display dialog box or so	71	# TODO: display dialog box or so
51	Carp::cluck $_[1];#d#TODO: remove when stable	72	Carp::cluck $_[1];#d#TODO: remove when stable
52	CFPlus::error $_[1];	73	return;#d#
		74	CFPlus::fatal ($_[1]);
53	};	75	};
54
55	$SIG{__DIE__} = sub {
56	return if CFPlus::in_destruct;
57	Carp::cluck $_[0];
58	CFPlus::error $_[0];
59	return;#d#
60	#return unless defined $^S && !$^S;
61	$Event::DIED->(undef, $_[0]);
62	};
63
64	our $VERSION = '0.1';
65		76
66	my $MAX_FPS = 60;	77	my $MAX_FPS = 60;
67	my $MIN_FPS = 5; # unused as of yet	78	my $MIN_FPS = 5; # unused as of yet
68		79
69	our $META_SERVER = "crossfire.real-time.com:13326";	80	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70		81
71	our $LAST_REFRESH;	82	our $LAST_REFRESH;
72	our $NOW;	83	our $NOW;
73		84
74	our $CFG;	85	our $CFG;
75	our $CONN;	86	our $CONN;
		87	our $PROFILE; # current profile
76	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	88	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77		89
78	our $WANT_REFRESH;	90	our $WANT_REFRESH;
79	our $CAN_REFRESH;	91	our $CAN_REFRESH;
80		92
…		…
146		158
147	sub debug {	159	sub debug {
148	$DEBUG_STATUS->set_text ($_[0]);	160	$DEBUG_STATUS->set_text ($_[0]);
149	}	161	}
150		162
		163	sub message {
		164	my ($para) = @_;
		165
		166	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		167
		168	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
		169
		170	$LOGVIEW->add_paragraph ($para);
		171	$LOGVIEW->scroll_to_bottom;
		172	}
		173
151	sub destroy_query_dialog {	174	sub destroy_query_dialog {
152	(delete $_[0]{query_dialog})->destroy	175	(delete $_[0]{query_dialog})->destroy
153	if $_[0]{query_dialog};	176	if $_[0]{query_dialog};
154	}	177	}
155		178
156	# server query dialog	179	# server query dialog
157	sub server_query {	180	sub server_query {
158	my ($conn, $flags, $prompt) = @_;	181	my ($conn, $flags, $prompt) = @_;
159		182
160	$conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame	183	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161	x => "center",	184	x => "center",
162	y => "center",	185	y => "center",
163	title => "Server Query",	186	title => "Server Query",
164	child => my $vbox = new CFPlus::UI::VBox,	187	child => my $vbox = new CFPlus::UI::VBox,
165	;	188	;
…		…
352	status "logging in...";	375	status "logging in...";
353		376
354	$LOGIN_BUTTON->set_text ("Logout");	377	$LOGIN_BUTTON->set_text ("Logout");
355	$SETUP_DIALOG->hide;	378	$SETUP_DIALOG->hide;
356		379
		380	$PROFILE = $CFG->{profile}{default};
		381
357	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	382	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358		383
359	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	384	my ($host, $port) = split /:/, $PROFILE->{host};
360		385
361	$MAP = new CFPlus::Map $mapsize, $mapsize;	386	$MAP = new CFPlus::Map;
362		387
363	$CONN = eval {	388	$CONN = eval {
364	new CFPlus::Protocol	389	new CFPlus::Protocol
365	host => $host,	390	host => $host,
366	port => $port \|\| 13327,	391	port => $port \|\| 13327,
367	user => $CFG->{profile}{default}{user},	392	user => $PROFILE->{user},
368	pass => $CFG->{profile}{default}{password},	393	pass => $PROFILE->{password},
369	mapw => $mapsize,	394	mapw => $mapsize,
370	maph => $mapsize,	395	maph => $mapsize,
		396
		397	client => "cfplus $CFPlus::VERSION $] $^O",
371		398
372	map_widget => $MAPWIDGET,	399	map_widget => $MAPWIDGET,
373	logview => $LOGVIEW,	400	logview => $LOGVIEW,
374	statusbox => $STATUSBOX,	401	statusbox => $STATUSBOX,
375	map => $MAP,	402	map => $MAP,
…		…
663	expand => 1,	690	expand => 1,
664	scroll_y => 1	691	scroll_y => 1
665	);	692	);
666	$r->add (my $vb = new CFPlus::UI::VBox);	693	$r->add (my $vb = new CFPlus::UI::VBox);
667		694
		695	$vb->add (new CFPlus::UI::FancyFrame
		696	label => "Player",
		697	child => (my $pi = new CFPlus::UI::VBox),
		698	);
		699
668	$vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	700	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669	can_hover => 1, can_events => 1,	701	can_hover => 1, can_events => 1,
670	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	702	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671	$vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	703	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672	can_hover => 1, can_events => 1,	704	can_hover => 1, can_events => 1,
673	tooltip => "The map you are currently on (if supported by the server).");	705	tooltip => "The map you are currently on (if supported by the server).");
674		706
675	$vb->add (my $hb0 = new CFPlus::UI::HBox);	707	$pi->add (my $hb0 = new CFPlus::UI::HBox);
676	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	708	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677	can_hover => 1, can_events => 1,	709	can_hover => 1, can_events => 1,
678	tooltip => "The weight of the player including all inventory items.");	710	tooltip => "The weight of the player including all inventory items.");
679	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	711	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680	can_hover => 1, can_events => 1,	712	can_hover => 1, can_events => 1,
681	tooltip => "The weight limit: you cannot carry more than this.");	713	tooltip => "The weight limit: you cannot carry more than this.");
682		714
		715	$vb->add (new CFPlus::UI::FancyFrame
		716	label => "Primary/Secondary Statistics",
683	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);	717	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		718	);
684	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);	719	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685		720
686	my $color2 = [1, 1, 0];	721	my $color2 = [1, 1, 0];
687		722
688	for (	723	for (
…		…
709	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	744	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	745	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711	align => -1, text => $label, tooltip => "#stat_$label");	746	align => -1, text => $label, tooltip => "#stat_$label");
712	}	747	}
713		748
		749	$vb->add (new CFPlus::UI::FancyFrame
		750	label => "Resistancies",
714	$vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);	751	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		752	);
715		753
716	my $row = 0;	754	my $row = 0;
717	my $col = 0;	755	my $col = 0;
718		756
719	my %resist_names = (	757	my %resist_names = (
…		…
819		857
820	my $table = $METASERVER->{table};	858	my $table = $METASERVER->{table};
821	$table->clear;	859	$table->clear;
822	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	860	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823		861
824	my $buf;	862	my $ok = 0;
825		863
826	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	864	CFPlus::background {
		865	my $ua = CFPlus::lwp_useragent;
827		866
828	unless ($fh) {	867	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829	$label->set_text ("unable to contact metaserver: $!");	868	} sub {
830	return;	869	my ($msg) = @_;
831	}	870	if ($msg) {
832
833	Event->io (fd => $fh, poll => 'r', cb => sub {
834	my $res = sysread $fh, $buf, 8192, length $buf;
835
836	if (!defined $res) {
837	$_[0]->w->cancel;
838	$label->set_text ("error while retrieving server list: $!");
839	} elsif ($res == 0) {
840	$_[0]->w->cancel;
841	status "server list retrieved";
842
843	utf8::decode $buf if utf8::valid $buf;
844
845	$table->clear;	871	$table->clear;
846		872
847	my @tip = (	873	my @tip = (
848	"The current number of users logged in on the server.",	874	"The current number of users logged in on the server.",
849	"The hostname of the server.",	875	"The hostname of the server.",
…		…
859	for 0 .. $#col;	885	for 0 .. $#col;
860		886
861	my @align = qw(1 0 1 1 -1);	887	my @align = qw(1 0 1 1 -1);
862		888
863	my $y = 0;	889	my $y = 0;
864	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	890	for my $m (
		891	sort {
		892	$b->{version} <=> $a->{version}
		893	or $b->{users} <=> $a->{users}
		894	}
		895	@{ $msg->{servers} }
		896	) {
865	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	897	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
		898	@$m{qw(ip age hostname users version description ibytes obytes uptime)};
866		899
867	for ($desc) {	900	for ($desc) {
868	s/<br>/\n/gi;	901	s/<br>/\n/gi;
869	s/<li>/\n· /gi;	902	s/<li>/\n· /gi;
870	s/<.*?>//sgi;	903	s/<.*?>//sgi;
871	s/&/&/g;	904	s/&/&/g;
872	s/</</g;	905	s/</</g;
873	s/>/>/g;	906	s/>/>/g;
874	}	907	}
875		908
876	$uptime = sprintf "%dd %02d:%02d:%02d",	909	$uptime = sprintf "%dd %02d:%02d:%02d",
877	(int $m->[8] / 86400),	910	(int $uptime / 86400),
878	(int $m->[8] / 3600) % 24,	911	(int $uptime / 3600) % 24,
879	(int $m->[8] / 60) % 60,	912	(int $uptime / 60) % 60,
880	$m->[8] % 60;	913	$uptime % 60;
881		914
882	$m = [$users, $host, $uptime, $version, $desc];	915	$m = [$users, $host, $uptime, $version, $desc];
883		916
884	$y++;	917	$y++;
885		918
…		…
895	),	928	),
896	(new CFPlus::UI::Empty expand => 1),	929	(new CFPlus::UI::Empty expand => 1),
897	]);	930	]);
898		931
899	$table->add ($_, $y, new CFPlus::UI::Label	932	$table->add ($_, $y, new CFPlus::UI::Label
		933	max_w => $::WIDTH * 0.4,
900	ellipsise => 0,	934	ellipsise => 0,
901	align => $align[$_],	935	align => $align[$_],
902	text => $m->[$_],	936	text => $m->[$_],
903	tooltip => $tip[$_],	937	tooltip => $tip[$_],
		938	fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
904	can_hover => 1,	939	can_hover => 1,
905	can_events => 1,	940	can_events => 1,
906	fontsize => 0.8)	941	fontsize => 0.8)
907	for 0 .. $#$m;	942	for 0 .. $#$m;
908	}	943	}
		944	} else {
		945	$ok or $label->set_text ("error while contacting metaserver");
909	}	946	}
910	});	947	};
		948
911	}	949	}
912		950
913	sub metaserver_dialog {	951	sub metaserver_dialog {
914	my $vbox = new CFPlus::UI::VBox;	952	my $vbox = new CFPlus::UI::VBox;
915	my $table = new CFPlus::UI::Table;	953	my $table = new CFPlus::UI::Table;
916	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);	954	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917		955
918	my $dialog = new CFPlus::UI::FancyFrame	956	my $dialog = new CFPlus::UI::Toplevel
919	title => "Server List",	957	title => "Server List",
920	name => 'metaserver_dialog',	958	name => 'metaserver_dialog',
921	x => 'center',	959	x => 'center',
922	y => 'center',	960	y => 'center',
923	z => 3,	961	z => 3,
		962	force_w => $::WIDTH * 0.9,
924	force_h => $::HEIGHT * 0.4,	963	force_h => $::HEIGHT * 0.7,
925	child => $vbox,	964	child => $vbox,
926	has_close_button => 1,	965	has_close_button => 1,
927	table => $table,	966	table => $table,
928	on_visibility_change => sub {	967	on_visibility_change => sub {
929	update_metaserver ($_[0]) if $_[1];	968	update_metaserver ($_[0]) if $_[1];
…		…
935	}	974	}
936		975
937	sub server_setup {	976	sub server_setup {
938	my $vbox = new CFPlus::UI::VBox;	977	my $vbox = new CFPlus::UI::VBox;
939		978
		979	$vbox->add (new CFPlus::UI::FancyFrame
		980	label => "Connection Settings",
940	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	981	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		982	);
941	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	983	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942		984
943	{	985	{
944	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);	986	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945		987
…		…
1029	},	1071	},
1030	);	1072	);
1031		1073
1032	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");	1074	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1033	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry	1075	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1034	text => $CFG->{say_command},	1076	text => $CFG->{say_command},
1035	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "	1077	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1036	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1078	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1037	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1079	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038	on_changed => sub {	1080	on_changed => sub {
1039	my ($self, $value) = @_;	1081	my ($self, $value) = @_;
1040	$CFG->{say_command} = $value;	1082	$CFG->{say_command} = $value;
1041	0	1083	0
1042	}	1084	}
1043	);	1085	);
1044		1086
		1087	$table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
		1088	$table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
		1089	state => $CFG->{show_tips},
		1090	tooltip => "Show the <b>Tip of the day</b> window at startup?",
		1091	on_changed => sub {
		1092	my ($self, $value) = @_;
		1093	$CFG->{show_tips} = $value;
		1094	0
		1095	}
		1096	);
		1097
1045	$vbox->add (new CFPlus::UI::Label	1098	$vbox->add (new CFPlus::UI::FancyFrame
1046	text => "Server Info",	1099	label => "Server Info",
1047	fontsize => 1.2,
1048	padding_y => 8,
1049	fg => [1, 1, 0, 1],
1050	);
1051
1052	$vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);	1100	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1101	);
1053		1102
1054	$vbox	1103	$vbox
1055	}	1104	}
1056		1105
1057	sub message_window {	1106	sub message_window {
1058	my $window = new CFPlus::UI::FancyFrame	1107	my $window = new CFPlus::UI::Toplevel
1059	name => "message_window",	1108	name => "message_window",
1060	title => "Messages",	1109	title => "Messages",
1061	border_bg => [1, 1, 1, 1],	1110	border_bg => [1, 1, 1, 1],
1062	x => "max",	1111	x => "max",
1063	y => 0,	1112	y => 0,
…		…
1113	window => $window,	1162	window => $window,
1114	input => $input,	1163	input => $input,
1115	};	1164	};
1116		1165
1117	$window	1166	$window
1118	}
1119
1120	sub open_string_query {
1121	my $cb = $_[1];
1122	my $dialog = new CFPlus::UI::FancyFrame
1123	x => "center",
1124	y => "center",
1125	z => 50,
1126	force_w => $WIDTH * 4/5,
1127	title => $_[0];
1128
1129	$dialog->add (
1130	my $e = new CFPlus::UI::Entry
1131	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133	);
1134
1135	$e->grab_focus;
1136	$dialog->show;
1137	}
1138
1139	sub open_quit_dialog {
1140	unless ($QUIT_DIALOG) {
1141	$QUIT_DIALOG = new CFPlus::UI::FancyFrame
1142	x => "center",
1143	y => "center",
1144	z => 50,
1145	title => "Really Quit?",
1146	on_key_down => sub {
1147	my ($dialog, $ev) = @_;
1148	$ev->{sym} == 27 and $dialog->hide;
1149	}
1150	;
1151
1152	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1153
1154	$vb->add (new CFPlus::UI::Label
1155	text => "You should find a savebed and apply it first!",
1156	max_w => $WIDTH * 0.25,
1157	ellipsize => 0,
1158	);
1159	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1160	$hb->add (new CFPlus::UI::Button
1161	text => "Ok",
1162	expand => 1,
1163	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1164	);
1165	$hb->add (new CFPlus::UI::Button
1166	text => "Quit anyway",
1167	expand => 1,
1168	on_activate => sub { exit },
1169	);
1170	}
1171
1172	$QUIT_DIALOG->show;
1173	$QUIT_DIALOG->grab_focus;
1174	}	1167	}
1175		1168
1176	sub autopickup_setup {	1169	sub autopickup_setup {
1177	my $table = new CFPlus::UI::Table;	1170	my $table = new CFPlus::UI::Table;
1178		1171
…		…
1335	$PL_WINDOW->show;	1328	$PL_WINDOW->show;
1336	}	1329	}
1337	}	1330	}
1338		1331
1339	sub player_window {	1332	sub player_window {
1340	my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame	1333	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341	x => "center",	1334	x => "center",
1342	y => "center",	1335	y => "center",
1343	force_w => $WIDTH * 9/10,	1336	force_w => $WIDTH * 9/10,
1344	force_h => $HEIGHT * 9/10,	1337	force_h => $HEIGHT * 9/10,
1345	title => "Player",	1338	title => "Player",
…		…
1387		1380
1388	my $refresh;	1381	my $refresh;
1389	$refresh = $BIND_UPD_CB = sub {	1382	$refresh = $BIND_UPD_CB = sub {
1390	$binding_list->clear ();	1383	$binding_list->clear ();
1391		1384
		1385	return unless $PROFILE;
		1386
1392	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {	1387	for my $mod (keys %{$PROFILE->{bindings}}) {
1393	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {	1388	for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1394	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1389	my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1395	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1390	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396		1391
1397	my $lbl = join "; ", @$cmds;	1392	my $lbl = join "; ", @$cmds;
1398	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);	1393	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399	$binding_list->add (my $hb = new CFPlus::UI::HBox);	1394	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1400	$hb->add (new CFPlus::UI::Button	1395	$hb->add (new CFPlus::UI::Button
1401	text => "delete",	1396	text => "delete",
1402	tooltip => "Deletes the binding",	1397	tooltip => "Deletes the binding",
1403	on_activate => sub {	1398	on_activate => sub {
1404	$binding_list->remove ($hb);	1399	$binding_list->remove ($hb);
1405	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1400	delete $PROFILE->{bindings}{$mod}{$sym};
1406	0	1401	0
1407	});	1402	});
1408		1403
1409	$hb->add (new CFPlus::UI::Button	1404	$hb->add (new CFPlus::UI::Button
1410	text => "edit",	1405	text => "edit",
1411	tooltip => "Edits the binding",	1406	tooltip => "Edits the binding",
1412	on_activate => sub {	1407	on_activate => sub {
1413	$::BIND_EDITOR->set_binding (	1408	$::BIND_EDITOR->set_binding (
1414	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},	1409	$mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1415	sub {	1410	sub {
1416	my ($nmod, $nsym, $ncmds) = @_;	1411	my ($nmod, $nsym, $ncmds) = @_;
1417	$::BIND_EDITOR->cfg_unbind ($mod, $sym);	1412	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);	1413	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419	$refresh->();	1414	$refresh->();
…		…
1434	}	1429	}
1435	}	1430	}
1436	};	1431	};
1437		1432
1438	my $vb = new CFPlus::UI::VBox;	1433	my $vb = new CFPlus::UI::VBox;
		1434	$vb->add (new CFPlus::UI::FancyFrame
		1435	label => "Options",
1439	$vb->add (my $hb = new CFPlus::UI::HBox);	1436	child => (my $hb = new CFPlus::UI::HBox),
		1437	);
1440	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");	1438	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441	$hb->add (new CFPlus::UI::CheckBox	1439	$hb->add (new CFPlus::UI::CheckBox
1442	expand => 1,	1440	expand => 1,
1443	state => $CFG->{shift_fire_stop},	1441	state => $CFG->{shift_fire_stop},
1444	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",	1442	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
…		…
1446	my ($cbox, $value) = @_;	1444	my ($cbox, $value) = @_;
1447	$CFG->{shift_fire_stop} = $value;	1445	$CFG->{shift_fire_stop} = $value;
1448	0	1446	0
1449	});	1447	});
1450		1448
1451	$vb->add ($binding_list);	1449	$vb->add (new CFPlus::UI::FancyFrame
		1450	label => "Bindings",
		1451	child => $binding_list);
1452	$vb->add (my $hb = new CFPlus::UI::HBox);	1452	$vb->add (my $hb = new CFPlus::UI::HBox);
1453		1453
1454	$hb->add (new CFPlus::UI::Button	1454	$hb->add (new CFPlus::UI::Button
1455	text => "record new",	1455	text => "record new",
1456	expand => 1,	1456	expand => 1,
…		…
1489		1489
1490	$vb	1490	$vb
1491	}	1491	}
1492		1492
1493	sub help_window {	1493	sub help_window {
1494	my $win = new CFPlus::UI::FancyFrame	1494	my $win = new CFPlus::UI::Toplevel
1495	x => 'center',	1495	x => 'center',
1496	y => 'center',	1496	y => 'center',
1497	z => 2,	1497	z => 4,
1498	name => 'doc_browser',	1498	name => 'doc_browser',
1499	force_w => int $WIDTH * 7/8,	1499	force_w => int $WIDTH * 7/8,
1500	force_h => int $HEIGHT * 7/8,	1500	force_h => int $HEIGHT * 7/8,
1501	title => "Help Browser",	1501	title => "Help Browser",
1502	has_close_button => 1;	1502	has_close_button => 1;
1503		1503
1504	$win->add (my $vbox = new CFPlus::UI::VBox);	1504	$win->add (my $vbox = new CFPlus::UI::VBox);
1505		1505
		1506	$vbox->add (new CFPlus::UI::FancyFrame
		1507	label => "Navigation",
1506	$vbox->add (my $buttons = new CFPlus::UI::HBox);	1508	child => (my $buttons = new CFPlus::UI::HBox),
		1509	);
1507	$vbox->add (my $viewer = new CFPlus::UI::TextScroller	1510	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508	expand => 1, fontsize => 0.8, padding_x => 4);	1511	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509		1512
1510	my @history;	1513	my @history;
1511	my @future;	1514	my @future;
1512	my $node;	1515	my $curnode;
1513		1516
1514	my $load_node; $load_node = sub {	1517	my $load_node; $load_node = sub {
1515	my ($node) = @_;	1518	my ($node, $para) = @_;
1516		1519
1517	$buttons->clear;	1520	$buttons->clear;
1518		1521
		1522	$buttons->add (new CFPlus::UI::Button
		1523	text => "⇤",
		1524	tooltip => "back to the starting page",
		1525	on_activate => sub {
		1526	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1527	unshift @future, @history;
		1528	@history = ();
		1529	$load_node->(@{shift @future});
		1530	},
		1531	);
		1532
1519	if (@history) {	1533	if (@history) {
1520	$buttons->add (new CFPlus::UI::Button label => "<", on_activate => sub {	1534	$buttons->add (new CFPlus::UI::Button
1521	unshift @future, $node if $node;	1535	text => "⋘",
		1536	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1537	on_activate => sub {
		1538	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1522	$node = pop @history;	1539	$load_node->(@{pop @history});
1523		1540	},
1524	});	1541	);
1525	}	1542	}
		1543
		1544	if (@future) {
		1545	$buttons->add (new CFPlus::UI::Button
		1546	text => "⋙",
		1547	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1548	on_activate => sub {
		1549	push @history, [$curnode, $viewer->current_paragraph];
		1550	$load_node->(@{shift @future});
		1551	},
		1552	);
		1553	}
		1554
		1555	$buttons->add (new CFPlus::UI::Label text => " ");
		1556
		1557	my @path = CFPlus::Pod::full_path_of $node;
		1558	pop @path; # drop current node
		1559
		1560	for my $node (@path) {
		1561	$buttons->add (new CFPlus::UI::Button
		1562	text => $node->{kw}[0],
		1563	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1564	on_activate => sub {
		1565	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1566	$load_node->($node);
		1567	},
		1568	);
		1569	$buttons->add (new CFPlus::UI::Label text => "/");
		1570	}
		1571
		1572	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1573
		1574	$curnode = $node;
		1575
1526	$viewer->clear;	1576	$viewer->clear;
1527	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $node);	1577	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1528	$viewer->set_offset (0);	1578	$viewer->scroll_to ($para);
1529	};	1579	};
1530		1580
1531	$load_node->(CFPlus::Pod::find pod => "mainpage");	1581	$load_node->(CFPlus::Pod::find pod => "mainpage");
1532		1582
1533	$CFPlus::Pod::on_link = sub {	1583	$CFPlus::Pod::goto_document = sub {
1534	my (@path) = @_;	1584	my (@path) = @_;
1535		1585
1536	push @history, $node if $node;	1586	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1537	@future = ();
1538		1587
1539	$load_node->(CFPlus::Pod::find @path);	1588	$load_node->((CFPlus::Pod::find @path)[0]);
1540	$win->show;	1589	$win->show;
1541	};	1590	};
1542		1591
1543	$win	1592	$win
		1593	}
		1594
		1595	sub open_string_query {
		1596	my ($title, $cb, $txt, $tooltip) = @_;
		1597	my $dialog = new CFPlus::UI::Toplevel
		1598	x => "center",
		1599	y => "center",
		1600	z => 50,
		1601	force_w => $WIDTH * 4/5,
		1602	title => $title;
		1603
		1604	$dialog->add (
		1605	my $e = new CFPlus::UI::Entry
		1606	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1607	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1608	tooltip => $tooltip
		1609	);
		1610
		1611	$e->grab_focus;
		1612	$e->set_text ($txt) if $txt;
		1613	$dialog->show;
		1614	}
		1615
		1616	sub open_quit_dialog {
		1617	unless ($QUIT_DIALOG) {
		1618	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1619	x => "center",
		1620	y => "center",
		1621	z => 50,
		1622	title => "Really Quit?",
		1623	on_key_down => sub {
		1624	my ($dialog, $ev) = @_;
		1625	$ev->{sym} == 27 and $dialog->hide;
		1626	}
		1627	;
		1628
		1629	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1630
		1631	$vb->add (new CFPlus::UI::Label
		1632	text => "You should find a savebed and apply it first!",
		1633	max_w => $WIDTH * 0.25,
		1634	ellipsize => 0,
		1635	);
		1636	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1637	$hb->add (new CFPlus::UI::Button
		1638	text => "Ok",
		1639	expand => 1,
		1640	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1641	);
		1642	$hb->add (new CFPlus::UI::Button
		1643	text => "Quit anyway",
		1644	expand => 1,
		1645	on_activate => sub { exit },
		1646	);
		1647	}
		1648
		1649	$QUIT_DIALOG->show;
		1650	$QUIT_DIALOG->grab_focus;
		1651	}
		1652
		1653	sub show_tip_of_the_day {
		1654	# find all tips
		1655	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1656
		1657	my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
		1658	$todindex = 0 if $todindex >= @tod;
		1659	$CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
		1660
		1661	# create dialog
		1662	my $dialog;
		1663
		1664	my $close = sub {
		1665	$dialog->destroy;
		1666	};
		1667
		1668	$dialog = new CFPlus::UI::Toplevel
		1669	x => "center",
		1670	y => "center",
		1671	z => 3,
		1672	name => 'tip_of_the_day',
		1673	force_w => int $WIDTH * 4/9,
		1674	force_h => int $WIDTH * 2/9,
		1675	title => "Tip of the day #" . (1 + $todindex),
		1676	child => my $vbox = new CFPlus::UI::VBox,
		1677	has_close_button => 1,
		1678	on_delete => $close,
		1679	;
		1680
		1681	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1682	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1683	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1684
		1685	$vbox->add (my $table = new CFPlus::UI::Table);
		1686
		1687	$table->add (0, 0, new CFPlus::UI::Button
		1688	text => "Close",
		1689	tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
		1690	on_activate => $close,
		1691	);
		1692
		1693	$table->add (2, 0, new CFPlus::UI::Button
		1694	text => "Next",
		1695	tooltip => "Show the next <b>Tip of the day</b>.",
		1696	on_activate => sub {
		1697	$close->();
		1698	&show_tip_of_the_day;
		1699	},
		1700	);
		1701
		1702	$dialog->show;
1544	}	1703	}
1545		1704
1546	sub sdl_init {	1705	sub sdl_init {
1547	CFPlus::SDL_Init	1706	CFPlus::SDL_Init
1548	and die "SDL::Init failed!\n";	1707	and die "SDL::Init failed!\n";
…		…
1595	force_x => 0,	1754	force_x => 0,
1596	force_y => "max",	1755	force_y => "max",
1597	child => $STATUSBOX,	1756	child => $STATUSBOX,
1598	)->show;	1757	)->show;
1599		1758
1600	CFPlus::UI::FancyFrame->new (	1759	CFPlus::UI::Toplevel->new (
1601	title => "Map",	1760	title => "Map",
1602	name => "mapmap",	1761	name => "mapmap",
1603	x => 0,	1762	x => 0,
1604	y => $FONTSIZE + 8,	1763	y => $FONTSIZE + 8,
1605	border_bg => [1, 1, 1, 192/255],	1764	border_bg => [1, 1, 1, 192/255],
…		…
1633	can_hover => 1,	1792	can_hover => 1,
1634	can_events => 1,	1793	can_events => 1,
1635	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1794	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1636	;	1795	;
1637		1796
1638	$SETUP_DIALOG = new CFPlus::UI::FancyFrame	1797	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1639	title => "Setup",	1798	title => "Setup",
1640	name => "setup_dialog",	1799	name => "setup_dialog",
1641	x => 'center',	1800	x => 'center',
1642	y => 'center',	1801	y => 'center',
1643	z => 2,	1802	z => 2,
…		…
1897	log_fontsize => 0.7,	2056	log_fontsize => 0.7,
1898	gauge_fontsize => 1,	2057	gauge_fontsize => 1,
1899	gauge_size => 0.35,	2058	gauge_size => 0.35,
1900	stat_fontsize => 0.7,	2059	stat_fontsize => 0.7,
1901	mapsize => 100,	2060	mapsize => 100,
1902	say_command => 'say',	2061	say_command => 'chat',
1903	audio_enable => 1,	2062	audio_enable => 1,
1904	bgm_enable => 1,	2063	bgm_enable => 1,
1905	bgm_volume => 0.25,	2064	bgm_volume => 0.25,
1906	face_prefetch => 0,	2065	face_prefetch => 0,
1907	output_sync => 1,	2066	output_sync => 1,
1908	output_count => 1,	2067	output_count => 1,
1909	pickup => 0,	2068	pickup => 0,
1910	inv_sort => "mtime",	2069	inv_sort => "mtime",
1911	default => "profile", # default profile	2070	default => "profile", # default profile
		2071	show_tips => 1,
1912	);	2072	);
1913		2073
1914	while (my ($k, $v) = each %DEF_CFG) {	2074	while (my ($k, $v) = each %DEF_CFG) {
1915	$CFG->{$k} = $v unless exists $CFG->{$k};	2075	$CFG->{$k} = $v unless exists $CFG->{$k};
1916	}	2076	}
…		…
1960	# }	2120	# }
1961	# my $t2 = Time::HiRes::time;	2121	# my $t2 = Time::HiRes::time;
1962	# warn $t2-$t1;	2122	# warn $t2-$t1;
1963	# }	2123	# }
1964		2124
		2125	$startup_done->();
		2126
1965	video_init;	2127	video_init;
1966	audio_init;	2128	audio_init;
1967	}	2129	}
		2130
		2131	show_tip_of_the_day if $CFG->{show_tips};
1968		2132
1969	Event::loop;	2133	Event::loop;
1970	#CFPlus::SDL_Quit;	2134	#CFPlus::SDL_Quit;
1971	#CFPlus::_exit 0;	2135	#CFPlus::_exit 0;
1972		2136

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.111 by root, Sun Aug 13 19:47:05 2006 UTC vs. Revision 1.126 by root, Sat Nov 18 18:19:05 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.111 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.126 by root, Sat Nov 18 18:19:05 2006 UTC