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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.41 by root, Fri Jun 2 02:21:48 2006 UTC vs.
Revision 1.57 by root, Mon Jun 5 21:10:04 2006 UTC

…		…
25	# need to do it again because that pile of garbage called PAR nukes it before main	25	# need to do it again because that pile of garbage called PAR nukes it before main
26	unshift @INC, $ENV{PAR_TEMP}	26	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	27	if %PAR::LibCache;
28		28
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;
31	use Event;	30	use Event;
32		31
33	use Crossfire;	32	use Crossfire;
34	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
35		34
…		…
41	use CFClient::UI;	40	use CFClient::UI;
42	use CFClient::MapWidget;	41	use CFClient::MapWidget;
43		42
44	$Event::DIED = sub {	43	$Event::DIED = sub {
45	# TODO: display dialog box or so	44	# TODO: display dialog box or so
		45	Carp::confess $_[1];#d#TODO: remove when stable
46	CFClient::error $_[1];	46	CFClient::error $_[1];
47	};	47	};
48		48
49	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#	49	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50		50
…		…
82	our $CONSOLE;	82	our $CONSOLE;
83	our $METASERVER;	83	our $METASERVER;
84	our $LOGIN_BUTTON;	84	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	85	our $QUIT_DIALOG;
86	our $HOST_ENTRY;	86	our $HOST_ENTRY;
87	our $SERVER_SETUP;	87
		88	our $SETUP_DIALOG;
		89	our $SETUP_NOTEBOOK;
		90	our $SETUP_SERVER;
		91	our $SETUP_KEYBOARD;
		92	our $SETUP_SPELLS;
88		93
89	our $FLOORBOX;	94	our $FLOORBOX;
90	our $GAUGES;	95	our $GAUGES;
91	our $STATWIDS;	96	our $STATWIDS;
92		97
…		…
104	our $INV_WINDOW;	109	our $INV_WINDOW;
105	our $INV;	110	our $INV;
106	our $INVR;	111	our $INVR;
107	our $INV_RIGHT_HB;	112	our $INV_RIGHT_HB;
108		113
109	our $BIND_WINDOW;
110	our $BIND_EDITOR;	114	our $BIND_EDITOR;
111		115
112	our $SPELL_LIST;	116	our $PICKUP_CFG;
113		117
114	sub status {	118	sub status {
115	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	119	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
116	}	120	}
117		121
…		…
121		125
122	sub start_game {	126	sub start_game {
123	status "logging in...";	127	status "logging in...";
124		128
125	$LOGIN_BUTTON->set_text ("Logout");	129	$LOGIN_BUTTON->set_text ("Logout");
126	$SERVER_SETUP->hide;	130	$SETUP_DIALOG->hide;
127		131
128	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	132	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
129		133
130	my ($host, $port) = split /:/, $CFG->{host};	134	my ($host, $port) = split /:/, $CFG->{host};
131		135
…		…
169	}	173	}
170	}	174	}
171		175
172	sub stop_game {	176	sub stop_game {
173	$LOGIN_BUTTON->set_text ("Login");	177	$LOGIN_BUTTON->set_text ("Login");
174	$SERVER_SETUP->show;	178	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
		179	$SETUP_DIALOG->show;
175	$INV_WINDOW->hide;	180	$INV_WINDOW->hide;
176	$LOGVIEW->hide;
177		181
178	return unless $CONN;	182	return unless $CONN;
179		183
180	status "connection closed";	184	status "connection closed";
181		185
182	$CONN->destroy;	186	$CONN->destroy;
183	$CONN = 0; # false, does not autovivify	187	$CONN = 0; # false, does not autovivify
184	}	188	}
185		189
186	sub client_setup {	190	sub graphics_setup {
187	my $dialog = new CFClient::UI::FancyFrame
188	x => 1,
189	y => $HEIGHT * (1/8),
190	name => "client_setup",
191	title => "Client Setup",
192	child => (my $vbox = new CFClient::UI::VBox);	191	my $vbox = new CFClient::UI::VBox;
193		192
194	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	193	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
195		194
196	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	195	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
197	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	196	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
…		…
321	on_activate => sub {	320	on_activate => sub {
322	video_shutdown ();	321	video_shutdown ();
323	video_init ();	322	video_init ();
324	}	323	}
325	);	324	);
		325
		326	$vbox
		327	}
		328
		329	sub audio_setup {
		330	my $vbox = new CFClient::UI::VBox;
		331
		332	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		333
		334	my $row = 0;
326		335
327	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	336	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
328	$table->add (1, $row++, new CFClient::UI::CheckBox	337	$table->add (1, $row++, new CFClient::UI::CheckBox
329	state => $CFG->{audio_enable},	338	state => $CFG->{audio_enable},
330	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	339	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
…		…
361	audio_shutdown ();	370	audio_shutdown ();
362	audio_init ();	371	audio_init ();
363	}	372	}
364	);	373	);
365		374
366	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	375	$vbox
367	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
368	text => $CFG->{say_command},
369	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. "
370	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
371	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
372	on_changed => sub {
373	my ($self, $value) = @_;
374	$CFG->{say_command} = $value;
375	}
376	);
377
378	$dialog
379	}	376	}
380		377
381	sub set_stats_window_fontsize {	378	sub set_stats_window_fontsize {
382	for (values %{$STATWIDS}) {	379	for (values %{$STATWIDS}) {
383	$_->set_fontsize ($::CFG->{stat_fontsize});	380	$_->set_fontsize ($::CFG->{stat_fontsize});
…		…
556	update_stats_window ({});	553	update_stats_window ({});
557		554
558	$tgw	555	$tgw
559	}	556	}
560		557
561	sub formsep {	558	sub formsep($) {
562	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	559	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
563	}	560	}
564		561
565	sub update_stats_window {	562	sub update_stats_window {
566	my ($stats) = @_;	563	my ($stats) = @_;
567		564
…		…
713	my $dialog = new CFClient::UI::FancyFrame	710	my $dialog = new CFClient::UI::FancyFrame
714	title => "Server List",	711	title => "Server List",
715	name => 'metaserver_dialog',	712	name => 'metaserver_dialog',
716	x => 'center',	713	x => 'center',
717	y => 'center',	714	y => 'center',
		715	z => 3,
718	child => (my $vbox = new CFClient::UI::VBox),	716	child => (my $vbox = new CFClient::UI::VBox),
719	on_visibility_change => sub {	717	on_visibility_change => sub {
720	update_metaserver if $_[1];	718	update_metaserver if $_[1];
721	},	719	},
722	;	720	;
…		…
725		723
726	$dialog	724	$dialog
727	}	725	}
728		726
729	sub server_setup {	727	sub server_setup {
730	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
731	x => "center",
732	y => "center",
733	name => "server_setup",
734	title => "Server Setup",
735	child => (my $vbox = new CFClient::UI::VBox),	728	my $vbox = new CFClient::UI::VBox;
736	;
737		729
738	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	730	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
739	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	731	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
740		732
741	{	733	{
…		…
834	$CONN ? stop_game	826	$CONN ? stop_game
835	: start_game;	827	: start_game;
836	},	828	},
837	);	829	);
838		830
839	$dialog	831	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
		832	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
		833	text => $CFG->{say_command},
		834	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. "
		835	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		836	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
		837	on_changed => sub {
		838	my ($self, $value) = @_;
		839	$CFG->{say_command} = $value;
		840	}
		841	);
		842
		843	$vbox
840	}	844	}
841		845
842	sub message_window {	846	sub message_window {
843	my $window = new CFClient::UI::FancyFrame	847	my $window = new CFClient::UI::FancyFrame
844	name => "message_window",	848	name => "message_window",
…		…
870	},	874	},
871	on_activate => sub {	875	on_activate => sub {
872	my ($input, $text) = @_;	876	my ($input, $text) = @_;
873	$input->set_text ('');	877	$input->set_text ('');
874		878
875	if ($text =~ /^\/bind\s+(.*)$/) {
876	CFClient::Binder::open_binding_dialog (sub {
877	my ($mod, $sym) = @_;
878	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
879	});
880	} elsif ($text =~ /^\/(.*)/) {	879	if ($text =~ /^\/(.*)/) {
881	$::CONN->user_send ($1);	880	$::CONN->user_send ($1);
882	} else {	881	} else {
883	my $say_cmd = $::CFG->{say_command} \|\| 'say';	882	my $say_cmd = $::CFG->{say_command} \|\| 'say';
884	$::CONN->user_send ("$say_cmd $text");	883	$::CONN->user_send ("$say_cmd $text");
885	}	884	}
…		…
904	sub open_quit_dialog {	903	sub open_quit_dialog {
905	unless ($QUIT_DIALOG) {	904	unless ($QUIT_DIALOG) {
906	$QUIT_DIALOG = new CFClient::UI::FancyFrame	905	$QUIT_DIALOG = new CFClient::UI::FancyFrame
907	x => "center",	906	x => "center",
908	y => "center",	907	y => "center",
		908	z => 50,
909	title => "Really Quit?",	909	title => "Really Quit?",
910	;	910	;
911		911
912	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	912	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
913		913
…		…
930	}	930	}
931		931
932	$QUIT_DIALOG->show;	932	$QUIT_DIALOG->show;
933	}	933	}
934		934
		935	sub autopickup_setup {
		936	my $table = new CFClient::UI::Table;
		937
		938	for (
		939	["General", 0, 0,
		940	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
		941	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
		942	["Stop before pickup" => CFClient::Pickup::PU_STOP],
		943	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
		944	],
		945	["Weapons", 0, 6,
		946	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
		947	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
		948	["Bows" => CFClient::Pickup::PU_BOW],
		949	["Arrows" => CFClient::Pickup::PU_ARROW],
		950	],
		951	["Armour", 0, 12,
		952	["Helmets" => CFClient::Pickup::PU_HELMET],
		953	["Shields" => CFClient::Pickup::PU_SHIELD],
		954	["Body Armour" => CFClient::Pickup::PU_ARMOUR],
		955	["Boots" => CFClient::Pickup::PU_BOOTS],
		956	["Gloves" => CFClient::Pickup::PU_GLOVES],
		957	["Cloaks" => CFClient::Pickup::PU_CLOAK],
		958	],
		959
		960	["Readables", 2, 2,
		961	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
		962	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
		963	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
		964	],
		965	["Misc", 2, 7,
		966	["Food" => CFClient::Pickup::PU_FOOD],
		967	["Drinks" => CFClient::Pickup::PU_DRINK],
		968	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
		969	["Keys" => CFClient::Pickup::PU_KEY],
		970	["Magical Items" => CFClient::Pickup::PU_MAGICAL],
		971	["Potions" => CFClient::Pickup::PU_POTION],
		972	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
		973	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
		974	["Jewelery" => CFClient::Pickup::PU_JEWELS],
		975	],
		976	)
		977	{
		978	my ($title, $x, $y, @bits) = @$_;
		979	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
		980
		981	for (@bits) {
		982	++$y;
		983
		984	my $mask = $_->[1];
		985	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
		986	$table->add ($x+1, $y, new CFClient::UI::CheckBox
		987	state => $CFG->{pickup} & $mask,
		988	on_changed => sub {
		989	my ($box, $value) = @_;
		990	if ($value) {
		991	$::CFG->{pickup} \|= $mask;
		992	} else {
		993	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
		994	}
		995	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
		996	if defined $::CONN;
		997	});
		998	}
		999	}
		1000
		1001	$table
		1002	}
		1003
935	sub make_inventory_window {	1004	sub make_inventory_window {
936	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1005	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
937	x => "center",	1006	x => "center",
938	y => "center",	1007	y => "center",
939	force_w => $WIDTH * 9/10,	1008	force_w => $WIDTH * 9/10,
…		…
957	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1026	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
958		1027
959	$invwin	1028	$invwin
960	}	1029	}
961		1030
962	sub make_spell_list {	1031	sub spell_setup {
963	$SPELL_LIST = new CFClient::UI::SpellList	1032	new CFClient::UI::SpellList
964	force_w => $WIDTH * (9/10),
965	force_h => $HEIGHT * (9/10);
966	$SPELL_LIST
967	}	1033	}
968		1034
969	sub make_binding_window {	1035	sub keyboard_setup {
970	my $binding_list = new CFClient::UI::VBox;	1036	my $binding_list = new CFClient::UI::VBox;
971		1037
972	my $refresh;	1038	my $refresh;
973	$refresh = sub {	1039	$refresh = sub {
974	$binding_list->clear ();	1040	$binding_list->clear ();
…		…
998	sub {	1064	sub {
999	my ($nmod, $nsym, $ncmds) = @_;	1065	my ($nmod, $nsym, $ncmds) = @_;
1000	delete $::CFG->{bindings}->{$mod}->{$sym};	1066	delete $::CFG->{bindings}->{$mod}->{$sym};
1001	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1067	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1002	$refresh->();	1068	$refresh->();
		1069	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1003	$::BIND_WINDOW->show;	1070	$SETUP_DIALOG->show;
1004	},	1071	},
1005	sub {	1072	sub {
		1073	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1006	$::BIND_WINDOW->show;	1074	$SETUP_DIALOG->show;
1007	});	1075	});
1008	$::BIND_EDITOR->show;	1076	$::BIND_EDITOR->show;
1009	$::BIND_WINDOW->hide;	1077	$SETUP_DIALOG->hide;
1010	});	1078	});
1011		1079
1012	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1080	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1013	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1081	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1014	}	1082	}
1015	}	1083	}
1016	};	1084	};
1017		1085
1018	$BIND_WINDOW = new CFClient::UI::FancyFrame
1019	title => "Bindings",
1020	x => "center",
1021	y => "center",
1022	def_w => int $WIDTH * 9/10,
1023	def_h => int $HEIGHT * 9/10,
1024	on_visibility_change => sub {
1025	my ($self, $visible) = @_;
1026	$refresh->() if $visible;
1027	};
1028
1029	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);	1086	my $vb = new CFClient::UI::VBox;
1030	$vb->add ($binding_list);	1087	$vb->add ($binding_list);
1031	$vb->add (my $hb = new CFClient::UI::HBox);	1088	$vb->add (my $hb = new CFClient::UI::HBox);
		1089
1032	$hb->add (new CFClient::UI::Button	1090	$hb->add (new CFClient::UI::Button
1033	text => "record new",	1091	text => "record new",
1034	expand => 1,	1092	expand => 1,
1035	tooltip => "This button opens the binding editor with an empty binding.",	1093	tooltip => "This button opens the binding editor with an empty binding.",
1036	on_activate => sub {	1094	on_activate => sub {
1037	$::BIND_EDITOR->set_binding (undef, undef, [],	1095	$::BIND_EDITOR->set_binding (undef, undef, [],
1038	sub {	1096	sub {
1039	my ($mod, $sym, $cmds) = @_;	1097	my ($mod, $sym, $cmds) = @_;
1040	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1098	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1041	$refresh->();	1099	$refresh->();
1042	$::BIND_WINDOW->show;	1100	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1101	$SETUP_DIALOG->show;
1043	},	1102	},
1044	sub {	1103	sub {
1045	$::BIND_WINDOW->show;	1104	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1105	$SETUP_DIALOG->show;
1046	});	1106	},
1047	$::BIND_WINDOW->hide;	1107	);
		1108	$SETUP_DIALOG->hide;
1048	$::BIND_EDITOR->show;	1109	$::BIND_EDITOR->show;
1049	},	1110	},
1050	);	1111	);
		1112
1051	$hb->add (new CFClient::UI::Button	1113	$hb->add (new CFClient::UI::Button
1052	text => "close",	1114	text => "close",
1053	tooltip => "Closes the binding window",	1115	tooltip => "Closes the binding window",
1054	expand => 1,	1116	expand => 1,
1055	on_activate => sub {	1117	on_activate => sub {
1056	$::BIND_WINDOW->hide;	1118	$SETUP_DIALOG->hide;
1057	}	1119	}
1058	);	1120	);
1059		1121
1060	$refresh->();	1122	$refresh->();
1061	$BIND_WINDOW	1123
		1124	$vb
1062	}	1125	}
1063		1126
1064	sub make_help_window {	1127	sub make_help_window {
1065	my $win = new CFClient::UI::FancyFrame	1128	my $win = new CFClient::UI::FancyFrame
1066	x => 'center',	1129	x => 'center',
1067	y => 'center',	1130	y => 'center',
		1131	z => 2,
1068	name => 'doc_browser',	1132	name => 'doc_browser',
1069	force_w => int $WIDTH * 7/8,	1133	force_w => int $WIDTH * 7/8,
1070	force_h => int $HEIGHT * 7/8,	1134	force_h => int $HEIGHT * 7/8,
1071	title => "Documentation";	1135	title => "Documentation";
1072		1136
…		…
1084	my ($pod, $label) = @$_;	1148	my ($pod, $label) = @$_;
1085		1149
1086	$buttons->add (new CFClient::UI::Button	1150	$buttons->add (new CFClient::UI::Button
1087	text => $label,	1151	text => $label,
1088	on_activate => sub {	1152	on_activate => sub {
1089	my $parser = new Pod::POM;	1153	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1090	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");	1154	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1091		1155
1092	$viewer->clear;	1156	$viewer->clear;
1093		1157
1094	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1158	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1095	for @{ CFClient::pod_to_pango_list $pom };	1159	for @$pom;
1096		1160
1097	$viewer->set_offset (0);	1161	$viewer->set_offset (0);
1098	},	1162	},
1099	);	1163	);
1100	}	1164	}
…		…
1147	$DEBUG_STATUS->show;	1211	$DEBUG_STATUS->show;
1148		1212
1149	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1213	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1150		1214
1151	$STATUSBOX = new CFClient::UI::Statusbox;	1215	$STATUSBOX = new CFClient::UI::Statusbox;
1152	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1216	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1153		1217
1154	(new CFClient::UI::Frame	1218	(new CFClient::UI::Frame
1155	bg => [0, 0, 0, 0.4],	1219	bg => [0, 0, 0, 0.4],
1156	force_x => 0,	1220	force_x => 0,
1157	force_y => "max",	1221	force_y => "max",
1158	child => $STATUSBOX,	1222	child => $STATUSBOX,
1159	)->show;	1223	)->show;
1160		1224
1161	CFClient::UI::FancyFrame->new (	1225	CFClient::UI::FancyFrame->new (
		1226	title => "Map",
		1227	name => "mapmap",
1162	x => 0,	1228	x => 0,
1163	y => $FONTSIZE + 8,	1229	y => $FONTSIZE + 8,
1164	border_bg => [1, 1, 1, 192/255],	1230	border_bg => [1, 1, 1, 192/255],
1165	bg => [1, 1, 1, 0],	1231	bg => [1, 1, 1, 0],
1166	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1232	child => ($MAPMAP = new CFClient::MapWidget::MapMap
…		…
1191	can_hover => 1,	1257	can_hover => 1,
1192	can_events => 1,	1258	can_events => 1,
1193	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1259	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1194	;	1260	;
1195		1261
		1262	$SETUP_DIALOG = new CFClient::UI::FancyFrame
		1263	title => "Setup",
		1264	name => "setup_dialog",
		1265	x => 'center',
		1266	y => 'center',
		1267	z => 2,
		1268	force_w => $::WIDTH * 0.6,
		1269	force_h => $::HEIGHT * 0.6,
		1270	;
		1271
		1272	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
		1273	filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
		1274
		1275	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
		1276	"Configure the server to play on, your username, password and other server-related options.");
		1277	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
		1278	"Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
		1279	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
		1280	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
		1281	$SETUP_NOTEBOOK->add (Audio => audio_setup,
		1282	"Configure the use of audio, sound effects and background music.");
		1283	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
		1284	"Lets you define, edit and delete bindings."
		1285	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
		1286	. "with nothing set and the recording started. After doing the actions you "
		1287	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
		1288	. "After pressing the combo the binding will be saved automatically and the "
		1289	. "binding editor closes");
		1290	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
		1291	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1292
1196	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;	1293	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1197		1294
1198	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1295	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1199	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1296	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1200	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1297
1201	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1202	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1298	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1203	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1299	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1204		1300
1205	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	1301	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1206		1302
1207	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1303	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1208	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1304	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1209	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1305	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1210	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."	1306	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1211	."You can also hit the Tab-key to show/hide the Inventory.");	1307	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1212		1308
1213	$BUTTONBAR->add (new CFClient::UI::Button	1309	$BUTTONBAR->add (new CFClient::UI::Button
1214	text => "Save Config",	1310	text => "Save Config",
1215	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1311	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1216	on_activate => sub {	1312	on_activate => sub {
…		…
1220	},	1316	},
1221	);	1317	);
1222		1318
1223	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1319	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1224	tooltip => "View Documentation");	1320	tooltip => "View Documentation");
1225
1226	$BUTTONBAR->add (new CFClient::UI::Flopper
1227	text => "Bindings",
1228	other => make_binding_window,
1229	tooltip =>
1230	"Lets you define, edit and delete bindings."
1231	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1232	."with nothing set and the recording started. After doing the actions you "
1233	."want to record press Insert and you will be asked to press a key-combo."
1234	."After pressing the combo the binding will be saved automatically and the "
1235	."binding editor closes");
1236
1237	$BUTTONBAR->add (new CFClient::UI::Flopper
1238	text => "Spells",
1239	other => make_spell_list,
1240	tooltip => "The spell list");
1241		1321
1242	$BUTTONBAR->add (new CFClient::UI::Button	1322	$BUTTONBAR->add (new CFClient::UI::Button
1243	text => "Quit",	1323	text => "Quit",
1244	tooltip => "Terminates the program",	1324	tooltip => "Terminates the program",
1245	on_activate => sub {	1325	on_activate => sub {
…		…
1250	}	1330	}
1251	},	1331	},
1252	);	1332	);
1253		1333
1254	$BUTTONBAR->show;	1334	$BUTTONBAR->show;
1255	$SERVER_SETUP->show;	1335	$SETUP_DIALOG->show;
		1336	}
1256		1337
1257	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1338	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1258	}
1259	}	1339	}
1260		1340
1261	sub video_shutdown {	1341	sub video_shutdown {
1262	undef $SDL_ACTIVE;	1342	undef $SDL_ACTIVE;
1263	}	1343	}
…		…
1395	};	1475	};
1396		1476
1397	CFClient::SDL_GL_SwapBuffers;	1477	CFClient::SDL_GL_SwapBuffers;
1398	}	1478	}
1399		1479
1400	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	1480	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1401	$NOW = time;	1481	$NOW = time;
1402		1482
1403	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	1483	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1404	for CFClient::SDL_PollEvent;	1484	for CFClient::SDL_PollEvent;
1405		1485
…		…
1472	#############################################################################	1552	#############################################################################
1473		1553
1474	$SIG{INT} = $SIG{TERM} = sub { exit };	1554	$SIG{INT} = $SIG{TERM} = sub { exit };
1475		1555
1476	{	1556	{
1477	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };	1557	local $SIG{__DIE__} = sub {
		1558	return unless defined $^S && !$^S;
		1559	Carp::confess $_[1];#d#TODO: remove when stable
		1560	CFClient::fatal $_[0];
		1561	};
1478		1562
1479	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1563	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1480	CFClient::UI::set_layout ($::CFG->{layout});	1564	CFClient::UI::set_layout ($::CFG->{layout});
1481		1565
1482	my %DEF_CFG = (	1566	my %DEF_CFG = (

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.41 by root, Fri Jun 2 02:21:48 2006 UTC vs. Revision 1.57 by root, Mon Jun 5 21:10:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.41 by root, Fri Jun 2 02:21:48 2006 UTC vs.
Revision 1.57 by root, Mon Jun 5 21:10:04 2006 UTC