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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.39 by root, Thu Jun 1 03:42:58 2006 UTC

…		…
81	our $LOGVIEW;	81	our $LOGVIEW;
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 $SERVER_SETUP;
86		87
87	our $FLOORBOX;	88	our $FLOORBOX;
88	our $GAUGES;	89	our $GAUGES;
89	our $STATWIDS;	90	our $STATWIDS;
90		91
…		…
97		98
98	our $ALT_ENTER_MESSAGE;	99	our $ALT_ENTER_MESSAGE;
99	our $STATUSBOX;	100	our $STATUSBOX;
100	our $DEBUG_STATUS;	101	our $DEBUG_STATUS;
101		102
		103	our $INV_WINDOW;
102	our $INV;	104	our $INV;
103	our $INVR;	105	our $INVR;
104	our $INVR_LBL;	106	our $INV_RIGHT_HB;
		107
		108	our $BIND_WINDOW;
		109	our $BIND_EDITOR;
		110
		111	our $SPELL_LIST;
105		112
106	sub status {	113	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	114	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	115	}
109		116
110	sub debug {	117	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	118	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	119	}
115		120
116	sub start_game {	121	sub start_game {
117	status "logging in...";	122	status "logging in...";
		123
		124	$LOGIN_BUTTON->set_text ("Logout");
		125	$SERVER_SETUP->hide;
118		126
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	127	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		128
121	my ($host, $port) = split /:/, $CFG->{host};	129	my ($host, $port) = split /:/, $CFG->{host};
122		130
…		…
151	};	159	};
152		160
153	if ($CONN) {	161	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	162	CFClient::lowdelay fileno $CONN->{fh};
155		163
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	164	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	165	} else {
163	status "unable to connect";	166	status "unable to connect";
164	stop_game();	167	stop_game();
165	}	168	}
166	}	169	}
167		170
168	sub stop_game {	171	sub stop_game {
		172	$LOGIN_BUTTON->set_text ("Login");
		173	$SERVER_SETUP->show;
		174	$INV_WINDOW->hide;
		175	$LOGVIEW->hide;
		176
169	return unless $CONN;	177	return unless $CONN;
170		178
171	status "connection closed";	179	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	180
173	$CONN->destroy;	181	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	182	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	183	}
179		184
180	sub client_setup {	185	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	186	my $dialog = new CFClient::UI::FancyFrame
182	req_x => 1,	187	x => 1,
183	req_y => $HEIGHT * (1/8),	188	y => $HEIGHT * (1/8),
184	name => "client_setup",	189	name => "client_setup",
185	title => "Client Setup",	190	title => "Client Setup",
186	child => (my $vbox = new CFClient::UI::VBox);	191	child => (my $vbox = new CFClient::UI::VBox);
		192
187	$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]);
188		194
189	$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");
190	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	196	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191		197
192	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	198	$hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
193	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	199	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194		200
195	$mode_slider->connect (changed => sub {	201	$mode_slider->connect (changed => sub {
196	my ($self, $value) = @_;	202	my ($self, $value) = @_;
197		203
…		…
385		391
386	sub make_gauge_window {	392	sub make_gauge_window {
387	my $gh = int $HEIGHT * $CFG->{gauge_size};	393	my $gh = int $HEIGHT * $CFG->{gauge_size};
388		394
389	my $win = new CFClient::UI::Frame (	395	my $win = new CFClient::UI::Frame (
390	req_x => 0,	396	force_x => 0,
391	req_y => -1,	397	force_y => "max",
392	def_w => $WIDTH,	398	force_w => $WIDTH,
393	def_h => $gh,	399	force_h => $gh,
394	);	400	);
395		401
396	$win->add (my $hbox = new CFClient::UI::HBox	402	$win->add (my $hbox = new CFClient::UI::HBox
397	children => [	403	children => [
398	(new CFClient::UI::HBox expand => 1),	404	(new CFClient::UI::HBox expand => 1),
…		…
434	&set_gauge_window_fontsize;	440	&set_gauge_window_fontsize;
435		441
436	$win	442	$win
437	}	443	}
438		444
		445
439	sub make_stats_window {	446	sub make_stats_window {
440	my $tgw = new CFClient::UI::FancyFrame	447	my $tgw = new CFClient::UI::FancyFrame
441	req_y => $HEIGHT * (2/8),	448	y => $HEIGHT * (2/8),
442	req_x => -1,	449	x => "max",
443	title => "Stats",	450	title => "Stats",
444	name => "stats_window";	451	name => "stats_window";
445		452
446	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	453	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
447	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	454	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
448	can_hover => 1, can_events => 1,	455	can_hover => 1, can_events => 1,
449	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	456	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
711	}	718	}
712	});	719	});
713	}	720	}
714		721
715	sub server_setup {	722	sub server_setup {
716	my $dialog = new CFClient::UI::FancyFrame	723	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
717	x => $WIDTH * (1/3),	724	x => "center",
718	y => $HEIGHT * (1/8),	725	y => "center",
719	name => "server_setup",	726	name => "server_setup",
720	title => "Server Setup",	727	title => "Server Setup",
721	child => (my $vbox = new CFClient::UI::VBox),	728	child => (my $vbox = new CFClient::UI::VBox),
722	on_visibility_change => sub {
723	my ($self, $visible) = @_;
724	$self->center if $visible;
725	},
726	;	729	;
727		730
728	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	731	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
729	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	732	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
730		733
…		…
776	}	779	}
777	);	780	);
778		781
779	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	782	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780	$table->add (1, 7, new CFClient::UI::Slider	783	$table->add (1, 7, new CFClient::UI::Slider
781	req_w => 100,	784	force_w => 100,
782	range => [$CFG->{mapsize}, 10, 100, 0, 1],	785	range => [$CFG->{mapsize}, 10, 100, 0, 1],
783	tooltip => "This is the size of the portion of the map update the server sends you. "	786	tooltip => "This is the size of the portion of the map update the server sends you. "
784	. "If you set this to a high value you will be able to see further, "	787	. "If you set this to a high value you will be able to see further, "
785	. "but you also increase bandwidth requirements and latency. "	788	. "but you also increase bandwidth requirements and latency. "
786	. "This option is only used once at log-in.",	789	. "This option is only used once at log-in.",
…		…
835	my $window = new CFClient::UI::FancyFrame	838	my $window = new CFClient::UI::FancyFrame
836	name => "message_window",	839	name => "message_window",
837	title => "Messages",	840	title => "Messages",
838	border_bg => [1, 1, 1, 1],	841	border_bg => [1, 1, 1, 1],
839	bg => [0, 0, 0, 0.75],	842	bg => [0, 0, 0, 0.75],
840	req_x => -1,	843	x => "max",
841	req_y => 0,	844	y => 0,
842	def_w => int $::WIDTH / 3,	845	force_w => $::WIDTH / 3,
843	def_h => int $::HEIGHT / 5,	846	force_h => $::HEIGHT / 5,
844	child => (my $vbox = new CFClient::UI::VBox);	847	child => (my $vbox = new CFClient::UI::VBox);
845		848
846	$vbox->add ($LOGVIEW);	849	$vbox->add ($LOGVIEW);
847		850
848	$vbox->add (my $input = new CFClient::UI::Entry	851	$vbox->add (my $input = new CFClient::UI::Entry
…		…
862	},	865	},
863	on_activate => sub {	866	on_activate => sub {
864	my ($input, $text) = @_;	867	my ($input, $text) = @_;
865	$input->set_text ('');	868	$input->set_text ('');
866		869
		870	if ($text =~ /^\/bind\s+(.*)$/) {
		871	CFClient::Binder::open_binding_dialog (sub {
		872	my ($mod, $sym) = @_;
		873	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		874	});
867	if ($text =~ /^\/(.*)/) {	875	} elsif ($text =~ /^\/(.*)/) {
868	$::CONN->user_send ($1);	876	$::CONN->user_send ($1);
869	} else {	877	} else {
870	my $say_cmd = $::CFG->{say_command} \|\| 'say';	878	my $say_cmd = $::CFG->{say_command} \|\| 'say';
871	$::CONN->user_send ("$say_cmd $text");	879	$::CONN->user_send ("$say_cmd $text");
872	}	880	}
…		…
880	},	888	},
881	);	889	);
882		890
883	$CONSOLE = {	891	$CONSOLE = {
884	window => $window,	892	window => $window,
885	input => $input	893	input => $input,
886	};	894	};
887		895
888	$window	896	$window
889	}	897	}
890		898
891	sub open_quit_dialog {	899	sub open_quit_dialog {
892	unless ($QUIT_DIALOG) {	900	unless ($QUIT_DIALOG) {
893	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	901	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		902	x => "center",
		903	y => "center",
		904	title => "Really Quit?",
		905	;
894		906
895	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	907	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
896		908
897	$vb->add (new CFClient::UI::Label	909	$vb->add (new CFClient::UI::Label
898	text => "You should find a savebed and apply it first!",	910	text => "You should find a savebed and apply it first!",
…		…
911	on_activate => sub { exit },	923	on_activate => sub { exit },
912	);	924	);
913	}	925	}
914		926
915	$QUIT_DIALOG->show;	927	$QUIT_DIALOG->show;
916	$QUIT_DIALOG->center;
917	}	928	}
918		929
919	sub make_inventory_window {	930	sub make_inventory_window {
920	my $invwin = new CFClient::UI::FancyFrame	931	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		932	x => "center",
		933	y => "center",
921	def_w => $WIDTH * 7/8,	934	force_w => $WIDTH * 9/10,
922	def_h => $HEIGHT * 7/8,	935	force_h => $HEIGHT * 9/10,
923	title => "Inventory",	936	title => "Inventory",
924	name => "inventory_window",
925	on_visibility_change => sub {
926	my ($self, $visible) = @_;
927	$self->center if $visible;
928	},
929	;	937	;
930		938
931	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	939	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
932		940
933	$hb->add (my $vb1 = new CFClient::UI::VBox);	941	$hb->add (my $vb1 = new CFClient::UI::VBox);
934	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	942	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
935	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	943	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
936		944
937	$hb->add (my $vb2 = new CFClient::UI::VBox);	945	$hb->add (my $vb2 = new CFClient::UI::VBox);
938		946
		947	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		948
		949	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		950
		951	# XXX: Call after $INVR = ... because set_opencont sets the items
		952	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		953
		954	$invwin
		955	}
		956
		957	sub make_spell_list {
		958	$SPELL_LIST = new CFClient::UI::SpellList
		959	force_w => $WIDTH * (9/10),
		960	force_h => $HEIGHT * (9/10);
		961	$SPELL_LIST
		962	}
		963
		964	sub make_binding_window {
		965	my $binding_list = new CFClient::UI::VBox;
		966
		967	my $refresh;
		968	$refresh = sub {
		969	$binding_list->clear ();
		970
		971	for my $mod (keys %{$::CFG->{bindings}}) {
		972	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		973	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		974	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		975
		976	my $lbl = join "; ", @$cmds;
		977	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		978	$binding_list->add (my $hb = new CFClient::UI::HBox);
		979	$hb->add (new CFClient::UI::Button
		980	text => "delete",
		981	tooltip => "Deletes the binding",
		982	on_activate => sub {
		983	$binding_list->remove ($hb);
		984	delete $::CFG->{bindings}->{$mod}->{$sym};
		985	});
		986
		987	$hb->add (new CFClient::UI::Button
		988	text => "edit",
		989	tooltip => "Edits the binding",
		990	on_activate => sub {
		991	$::BIND_EDITOR->set_binding (
		992	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		993	sub {
		994	my ($nmod, $nsym, $ncmds) = @_;
		995	delete $::CFG->{bindings}->{$mod}->{$sym};
		996	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		997	$refresh->();
		998	$::BIND_WINDOW->show;
		999	},
		1000	sub {
		1001	$::BIND_WINDOW->show;
		1002	});
		1003	$::BIND_EDITOR->show;
		1004	$::BIND_WINDOW->hide;
		1005	});
		1006
		1007	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1008	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1009	}
		1010	}
		1011	};
		1012
		1013	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1014	title => "Bindings",
		1015	x => "center",
		1016	y => "center",
		1017	def_w => int $WIDTH * 9/10,
		1018	def_h => int $HEIGHT * 9/10,
		1019	on_visibility_change => sub {
		1020	my ($self, $visible) = @_;
		1021	$refresh->() if $visible;
		1022	};
		1023
		1024	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1025	$vb->add ($binding_list);
939	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1026	$vb->add (my $hb = new CFClient::UI::HBox);
940	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
941	$hb2->add (new CFClient::UI::Button	1027	$hb->add (new CFClient::UI::Button
942	text => "Close",	1028	text => "record new",
943	tooltip => "Close the currently open container (if one is open)",	1029	expand => 1,
		1030	tooltip => "This button opens the binding editor with an empty binding.",
944	on_activate => sub {	1031	on_activate => sub {
945	$CONN->send ("apply $CONN->{open_container}")	1032	$::BIND_EDITOR->set_binding (undef, undef, [],
946	if $CONN->{open_container} != 0;	1033	sub {
		1034	my ($mod, $sym, $cmds) = @_;
		1035	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1036	$refresh->();
		1037	$::BIND_WINDOW->show;
		1038	},
		1039	sub {
		1040	$::BIND_WINDOW->show;
		1041	});
		1042	$::BIND_WINDOW->hide;
		1043	$::BIND_EDITOR->show;
947	},	1044	},
948	);	1045	);
		1046	$hb->add (new CFClient::UI::Button
		1047	text => "close",
		1048	tooltip => "Closes the binding window",
		1049	expand => 1,
		1050	on_activate => sub {
		1051	$::BIND_WINDOW->hide;
		1052	}
		1053	);
949		1054
950	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1055	$refresh->();
951		1056	$BIND_WINDOW
952	$invwin
953	}	1057	}
954		1058
955	sub make_help_window {	1059	sub make_help_window {
956	my $win = new CFClient::UI::FancyFrame	1060	my $win = new CFClient::UI::FancyFrame
957	def_w => int $WIDTH * 7/8,	1061	def_w => int $WIDTH * 7/8,
…		…
1025	if ($DEBUG_STATUS) {	1129	if ($DEBUG_STATUS) {
1026	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1130	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027	} else {	1131	} else {
1028	# create the widgets	1132	# create the widgets
1029		1133
1030	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1134	$DEBUG_STATUS = new CFClient::UI::Label
		1135	padding => 0,
		1136	z => 100,
		1137	force_x => "max",
		1138	force_y => 0;
1031	$DEBUG_STATUS->show;	1139	$DEBUG_STATUS->show;
1032		1140
		1141	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1142
1033	$STATUSBOX = new CFClient::UI::Statusbox;	1143	$STATUSBOX = new CFClient::UI::Statusbox;
1034	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1144	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1035		1145
1036	(new CFClient::UI::Frame	1146	(new CFClient::UI::Frame
1037	bg => [0, 0, 0, 0.4],	1147	bg => [0, 0, 0, 0.4],
1038	req_y => -1,	1148	force_x => 0,
		1149	force_y => "max",
1039	child => $STATUSBOX,	1150	child => $STATUSBOX,
1040	)->show;	1151	)->show;
1041		1152
1042	CFClient::UI::FancyFrame->new (	1153	CFClient::UI::FancyFrame->new (
		1154	x => 0,
		1155	y => $FONTSIZE + 8,
1043	border_bg => [1, 1, 1, 192/255],	1156	border_bg => [1, 1, 1, 192/255],
1044	bg => [1, 1, 1, 0],	1157	bg => [1, 1, 1, 0],
1045	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1158	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1046	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1159	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047	),	1160	),
…		…
1070	can_hover => 1,	1183	can_hover => 1,
1071	can_events => 1,	1184	can_events => 1,
1072	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1185	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1073	;	1186	;
1074		1187
1075	$BUTTONBAR = new CFClient::UI::HBox;	1188	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1076		1189
1077	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1190	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1078	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1191	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1192	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1080	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1193	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
1084	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	1197	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
1085		1198
1086	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1199	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1087	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1200	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1088	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1201	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1089	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1202	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1203	."You can also hit the Tab-key to show/hide the Inventory.");
1090		1204
1091	$BUTTONBAR->add (new CFClient::UI::Button	1205	$BUTTONBAR->add (new CFClient::UI::Button
1092	text => "Save Config",	1206	text => "Save Config",
1093	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1207	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1094	on_activate => sub {	1208	on_activate => sub {
1095	$::CFG->{layout} = CFClient::UI::get_layout;	1209	$::CFG->{layout} = CFClient::UI::get_layout;
1096	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1210	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097	status "Configuration Saved";	1211	status "Configuration Saved";
1098	},	1212	},
1099	);	1213	);
1100		1214
1101	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1215	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1102	tooltip => "View Documentation");	1216	tooltip => "View Documentation");
		1217
		1218	$BUTTONBAR->add (new CFClient::UI::Flopper
		1219	text => "Bindings",
		1220	other => make_binding_window,
		1221	tooltip =>
		1222	"Lets you define, edit and delete bindings."
		1223	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1224	."with nothing set and the recording started. After doing the actions you "
		1225	."want to record press Insert and you will be asked to press a key-combo."
		1226	."After pressing the combo the binding will be saved automatically and the "
		1227	."binding editor closes");
		1228
		1229	$BUTTONBAR->add (new CFClient::UI::Flopper
		1230	text => "Spells",
		1231	other => make_spell_list,
		1232	tooltip => "The spell list");
1103		1233
1104	$BUTTONBAR->add (new CFClient::UI::Button	1234	$BUTTONBAR->add (new CFClient::UI::Button
1105	text => "Quit",	1235	text => "Quit",
1106	tooltip => "Terminates the program",	1236	tooltip => "Terminates the program",
1107	on_activate => sub {	1237	on_activate => sub {
…		…
1112	}	1242	}
1113	},	1243	},
1114	);	1244	);
1115		1245
1116	$BUTTONBAR->show;	1246	$BUTTONBAR->show;
		1247	$SERVER_SETUP->show;
1117		1248
1118	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1249	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1119
1120	# delay till geometry is constant
1121	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
1122	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1123	my $widget = $GAUGES->{win};
1124	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1125	});
1126	force_refresh ();
1127	}	1250	}
1128	}	1251	}
1129		1252
1130	sub video_shutdown {	1253	sub video_shutdown {
1131	undef $SDL_ACTIVE;	1254	undef $SDL_ACTIVE;
…		…
1199		1322
1200	my %demo;#d#	1323	my %demo;#d#
1201		1324
1202	sub force_refresh {	1325	sub force_refresh {
1203	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1326	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1204	debug sprintf "%3.2f", $fps;	1327	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1205		1328
1206	$CFClient::UI::ROOT->draw;	1329	$CFClient::UI::ROOT->draw;
1207		1330
1208	$WANT_REFRESH = 0;	1331	$WANT_REFRESH = 0;
1209	$CAN_REFRESH = 0;	1332	$CAN_REFRESH = 0;
…		…
1341	#############################################################################	1464	#############################################################################
1342		1465
1343	$SIG{INT} = $SIG{TERM} = sub { exit };	1466	$SIG{INT} = $SIG{TERM} = sub { exit };
1344		1467
1345	{	1468	{
1346	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1469	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1347		1470
1348	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1471	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1349	CFClient::UI::set_layout ($::CFG->{layout});	1472	CFClient::UI::set_layout ($::CFG->{layout});
1350		1473
1351	my %DEF_CFG = (	1474	my %DEF_CFG = (
1352	sdl_mode => 0,	1475	sdl_mode => 0,
1353	width => 640,	1476	width => 640,
…		…
1431		1554
1432	END { CFClient::SDL_Quit }	1555	END { CFClient::SDL_Quit }
1433		1556
1434	=head1 NAME	1557	=head1 NAME
1435		1558
1436	pclient - A Crossfire+ and Crossfire game client	1559	cfplus - A Crossfire+ and Crossfire game client
1437		1560
1438	=head1 SYNOPSIS	1561	=head1 SYNOPSIS
1439		1562
1440	Just run it - no commandline arguments are supported.	1563	Just run it - no commandline arguments are supported.
1441		1564
1442	=head1 USAGE	1565	=head1 USAGE
1443		1566
1444	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1567	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1445	fullscreen and interactively.	1568	fullscreen and interactively.
1446		1569
		1570	=head1 DEBUGGING
		1571
		1572
		1573	CFPLUS_DEBUG - environment variable
		1574
		1575	1 draw borders around widgets
		1576	2 add low-level widget info to tooltips
		1577	4 show fps
		1578	8 suppress tooltips
		1579
1447	=head1 AUTHOR	1580	=head1 AUTHOR
1448		1581
1449	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1582	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1450		1583
1451		1584

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs. Revision 1.39 by root, Thu Jun 1 03:42:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.39 by root, Thu Jun 1 03:42:58 2006 UTC