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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.37 by elmex, Wed May 31 10:15:34 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;
105		110
106	sub status {	111	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	112	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	113	}
109		114
110	sub debug {	115	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	116	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	117	}
115		118
116	sub start_game {	119	sub start_game {
117	status "logging in...";	120	status "logging in...";
		121
		122	$LOGIN_BUTTON->set_text ("Logout");
		123	$SERVER_SETUP->hide;
118		124
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	125	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		126
121	my ($host, $port) = split /:/, $CFG->{host};	127	my ($host, $port) = split /:/, $CFG->{host};
122		128
…		…
151	};	157	};
152		158
153	if ($CONN) {	159	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	160	CFClient::lowdelay fileno $CONN->{fh};
155		161
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	162	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	163	} else {
163	status "unable to connect";	164	status "unable to connect";
164	stop_game();	165	stop_game();
165	}	166	}
166	}	167	}
167		168
168	sub stop_game {	169	sub stop_game {
		170	$LOGIN_BUTTON->set_text ("Login");
		171	$SERVER_SETUP->show;
		172	$INV_WINDOW->hide;
		173	$LOGVIEW->hide;
		174
169	return unless $CONN;	175	return unless $CONN;
170		176
171	status "connection closed";	177	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	178
173	$CONN->destroy;	179	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	180	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	181	}
179		182
180	sub client_setup {	183	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	184	my $dialog = new CFClient::UI::FancyFrame
		185	x => 1,
		186	y => $HEIGHT * (1/8),
182	name => "client_setup",	187	name => "client_setup",
183	title => "Client Setup",	188	title => "Client Setup",
184	child => (my $vbox = new CFClient::UI::VBox);	189	child => (my $vbox = new CFClient::UI::VBox);
		190
185	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	191	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186		192
187	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	193	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
188	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	194	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189		195
190	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	196	$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]);
191	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	197	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192		198
193	$mode_slider->connect (changed => sub {	199	$mode_slider->connect (changed => sub {
194	my ($self, $value) = @_;	200	my ($self, $value) = @_;
195		201
…		…
383		389
384	sub make_gauge_window {	390	sub make_gauge_window {
385	my $gh = int $HEIGHT * $CFG->{gauge_size};	391	my $gh = int $HEIGHT * $CFG->{gauge_size};
386		392
387	my $win = new CFClient::UI::Frame (	393	my $win = new CFClient::UI::Frame (
388	req_y => -1,	394	force_x => 0,
		395	force_y => "max",
389	user_w => $WIDTH,	396	force_w => $WIDTH,
390	user_h => $gh,	397	force_h => $gh,
391	);	398	);
392		399
393	$win->add (my $hbox = new CFClient::UI::HBox	400	$win->add (my $hbox = new CFClient::UI::HBox
394	children => [	401	children => [
395	(new CFClient::UI::HBox expand => 1),	402	(new CFClient::UI::HBox expand => 1),
…		…
431	&set_gauge_window_fontsize;	438	&set_gauge_window_fontsize;
432		439
433	$win	440	$win
434	}	441	}
435		442
		443
436	sub make_stats_window {	444	sub make_stats_window {
437	my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window";	445	my $tgw = new CFClient::UI::FancyFrame
		446	y => $HEIGHT * (2/8),
		447	x => "max",
		448	title => "Stats",
		449	name => "stats_window";
438		450
439	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	451	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	452	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441	can_hover => 1, can_events => 1,	453	can_hover => 1, can_events => 1,
442	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	454	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
704	}	716	}
705	});	717	});
706	}	718	}
707		719
708	sub server_setup {	720	sub server_setup {
709	my $dialog = new CFClient::UI::FancyFrame	721	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
		722	x => "center",
		723	y => "center",
710	name => "server_setup",	724	name => "server_setup",
711	title => "Server Setup",	725	title => "Server Setup",
712	child => (my $vbox = new CFClient::UI::VBox);	726	child => (my $vbox = new CFClient::UI::VBox),
713		727	;
		728
714	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	729	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
715	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	730	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
716		731
717	{	732	{
718	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	733	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
…		…
762	}	777	}
763	);	778	);
764		779
765	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	780	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
766	$table->add (1, 7, new CFClient::UI::Slider	781	$table->add (1, 7, new CFClient::UI::Slider
767	req_w => 100,	782	force_w => 100,
768	range => [$CFG->{mapsize}, 10, 100, 0, 1],	783	range => [$CFG->{mapsize}, 10, 100, 0, 1],
769	tooltip => "This is the size of the portion of the map update the server sends you. "	784	tooltip => "This is the size of the portion of the map update the server sends you. "
770	. "If you set this to a high value you will be able to see further, "	785	. "If you set this to a high value you will be able to see further, "
771	. "but you also increase bandwidth requirements and latency. "	786	. "but you also increase bandwidth requirements and latency. "
772	. "This option is only used once at log-in.",	787	. "This option is only used once at log-in.",
…		…
821	my $window = new CFClient::UI::FancyFrame	836	my $window = new CFClient::UI::FancyFrame
822	name => "message_window",	837	name => "message_window",
823	title => "Messages",	838	title => "Messages",
824	border_bg => [1, 1, 1, 1],	839	border_bg => [1, 1, 1, 1],
825	bg => [0, 0, 0, 0.75],	840	bg => [0, 0, 0, 0.75],
		841	x => "max",
		842	y => 0,
826	user_w => int $::WIDTH / 3,	843	force_w => $::WIDTH / 3,
827	user_h => int $::HEIGHT / 5,	844	force_h => $::HEIGHT / 5,
828	child => (my $vbox = new CFClient::UI::VBox);	845	child => (my $vbox = new CFClient::UI::VBox);
829		846
830	$vbox->add ($LOGVIEW);	847	$vbox->add ($LOGVIEW);
831		848
832	$vbox->add (my $input = new CFClient::UI::Entry	849	$vbox->add (my $input = new CFClient::UI::Entry
…		…
846	},	863	},
847	on_activate => sub {	864	on_activate => sub {
848	my ($input, $text) = @_;	865	my ($input, $text) = @_;
849	$input->set_text ('');	866	$input->set_text ('');
850		867
		868	if ($text =~ /^\/bind\s+(.*)$/) {
		869	CFClient::Binder::open_binding_dialog (sub {
		870	my ($mod, $sym) = @_;
		871	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		872	});
851	if ($text =~ /^\/(.*)/) {	873	} elsif ($text =~ /^\/(.*)/) {
852	$::CONN->user_send ($1);	874	$::CONN->user_send ($1);
853	} else {	875	} else {
854	my $say_cmd = $::CFG->{say_command} \|\| 'say';	876	my $say_cmd = $::CFG->{say_command} \|\| 'say';
855	$::CONN->user_send ("$say_cmd $text");	877	$::CONN->user_send ("$say_cmd $text");
856	}	878	}
…		…
864	},	886	},
865	);	887	);
866		888
867	$CONSOLE = {	889	$CONSOLE = {
868	window => $window,	890	window => $window,
869	input => $input	891	input => $input,
870	};	892	};
871		893
872	$window	894	$window
873	}	895	}
874		896
875	sub open_quit_dialog {	897	sub open_quit_dialog {
876	unless ($QUIT_DIALOG) {	898	unless ($QUIT_DIALOG) {
877
878	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	899	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		900	x => "center",
		901	y => "center",
		902	title => "Really Quit?",
		903	;
879		904
880	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	905	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881		906
882	$vb->add (new CFClient::UI::Label	907	$vb->add (new CFClient::UI::Label
883	text => "You should find a savebed and apply it first!",	908	text => "You should find a savebed and apply it first!",
…		…
893	$hb->add (new CFClient::UI::Button	918	$hb->add (new CFClient::UI::Button
894	text => "Quit anyway",	919	text => "Quit anyway",
895	expand => 1,	920	expand => 1,
896	on_activate => sub { exit },	921	on_activate => sub { exit },
897	);	922	);
		923	}
898		924
899	$QUIT_DIALOG->show_centered;	925	$QUIT_DIALOG->show;
900	} else {
901	$QUIT_DIALOG->show_centered;
902	}
903	}	926	}
904		927
905	sub make_inventory_window {	928	sub make_inventory_window {
906	my $invwin = new CFClient::UI::FancyFrame	929	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window";	930	x => "center",
		931	y => "center",
		932	force_w => $WIDTH * 9/10,
		933	force_h => $HEIGHT * 9/10,
		934	title => "Inventory",
		935	;
908		936
909	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	937	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
910		938
911	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	939	$hb->add (my $vb1 = new CFClient::UI::VBox);
912	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	940	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
913	$lbl->set_text ("Player");
914	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	941	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915		942
916	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);	943	$hb->add (my $vb2 = new CFClient::UI::VBox);
917		944
		945	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		946
		947	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		948
		949	# XXX: Call after $INVR = ... because set_opencont sets the items
		950	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		951
		952	$invwin
		953	}
		954
		955	sub make_binding_window {
		956	my $binding_list = new CFClient::UI::VBox;
		957
		958	my $refresh;
		959	$refresh = sub {
		960	$binding_list->clear ();
		961
		962	for my $mod (keys %{$::CFG->{bindings}}) {
		963	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		964	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		965	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		966
		967	my $lbl = join "; ", @$cmds;
		968	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		969	$binding_list->add (my $hb = new CFClient::UI::HBox);
		970	$hb->add (new CFClient::UI::Button
		971	text => "delete",
		972	tooltip => "Deletes the binding",
		973	on_activate => sub {
		974	$binding_list->remove ($hb);
		975	delete $::CFG->{bindings}->{$mod}->{$sym};
		976	});
		977
		978	$hb->add (new CFClient::UI::Button
		979	text => "edit",
		980	tooltip => "Edits the binding",
		981	on_activate => sub {
		982	$::BIND_EDITOR->set_binding (
		983	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		984	sub {
		985	my ($nmod, $nsym, $ncmds) = @_;
		986	delete $::CFG->{bindings}->{$mod}->{$sym};
		987	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		988	$refresh->();
		989	$::BIND_WINDOW->show;
		990	},
		991	sub {
		992	$::BIND_WINDOW->show;
		993	});
		994	$::BIND_EDITOR->show;
		995	$::BIND_WINDOW->hide;
		996	});
		997
		998	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		999	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1000	}
		1001	}
		1002	};
		1003
		1004	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1005	title => "Bindings",
		1006	x => "center",
		1007	y => "center",
		1008	def_w => int $WIDTH * 9/10,
		1009	def_h => int $HEIGHT * 9/10,
		1010	on_visibility_change => sub {
		1011	my ($self, $visible) = @_;
		1012	$refresh->() if $visible;
		1013	};
		1014
		1015	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1016	$vb->add ($binding_list);
918	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1017	$vb->add (my $hb = new CFClient::UI::HBox);
919	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
920	$hb2->add (new CFClient::UI::Button	1018	$hb->add (new CFClient::UI::Button
921	text => "Close",	1019	text => "record new",
922	tooltip => "Close the currently open container (if one is open)",	1020	expand => 1,
		1021	tooltip => "This button opens the binding editor with an empty binding.",
923	on_activate => sub {	1022	on_activate => sub {
924	$CONN->send ("apply $CONN->{open_container}")	1023	$::BIND_EDITOR->set_binding (undef, undef, [],
925	if $CONN->{open_container} != 0;	1024	sub {
		1025	my ($mod, $sym, $cmds) = @_;
		1026	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1027	$refresh->();
		1028	$::BIND_WINDOW->show;
		1029	},
		1030	sub {
		1031	$::BIND_WINDOW->show;
		1032	});
		1033	$::BIND_WINDOW->hide;
		1034	$::BIND_EDITOR->show;
926	},	1035	},
927	);	1036	);
		1037	$hb->add (new CFClient::UI::Button
		1038	text => "close",
		1039	tooltip => "Closes the binding window",
		1040	expand => 1,
		1041	on_activate => sub {
		1042	$::BIND_WINDOW->hide;
		1043	}
		1044	);
928		1045
929	$INVR_LBL->set_text ("Floor");	1046	$refresh->();
930	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1047	$BIND_WINDOW
931
932	$invwin
933	}	1048	}
934		1049
935	sub make_help_window {	1050	sub make_help_window {
936	my $win = new CFClient::UI::FancyFrame	1051	my $win = new CFClient::UI::FancyFrame
937	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	1052	def_w => int $WIDTH * 7/8,
		1053	def_h => int $HEIGHT * 7/8,
		1054	title => "Documentation";
938		1055
939	$win->add (my $vbox = new CFClient::UI::VBox);	1056	$win->add (my $vbox = new CFClient::UI::VBox);
940		1057
941	$vbox->add (my $buttons = new CFClient::UI::HBox);	1058	$vbox->add (my $buttons = new CFClient::UI::HBox);
942	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1059	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1003	if ($DEBUG_STATUS) {	1120	if ($DEBUG_STATUS) {
1004	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1121	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1005	} else {	1122	} else {
1006	# create the widgets	1123	# create the widgets
1007		1124
1008	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1125	$DEBUG_STATUS = new CFClient::UI::Label
		1126	padding => 0,
		1127	z => 100,
		1128	force_x => "max",
		1129	force_y => 0;
1009	$DEBUG_STATUS->show;	1130	$DEBUG_STATUS->show;
1010		1131
		1132	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1133
1011	$STATUSBOX = new CFClient::UI::Statusbox;	1134	$STATUSBOX = new CFClient::UI::Statusbox;
1012	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1135	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1013		1136
1014	(new CFClient::UI::Frame	1137	(new CFClient::UI::Frame
1015	bg => [0, 0, 0, 0.4],	1138	bg => [0, 0, 0, 0.4],
1016	req_y => -1,	1139	force_x => 0,
		1140	force_y => "max",
1017	child => $STATUSBOX,	1141	child => $STATUSBOX,
1018	)->show;	1142	)->show;
1019		1143
1020	CFClient::UI::FancyFrame->new (	1144	CFClient::UI::FancyFrame->new (
		1145	x => 0,
		1146	y => $FONTSIZE + 8,
1021	border_bg => [1, 1, 1, 192/255],	1147	border_bg => [1, 1, 1, 192/255],
1022	bg => [1, 1, 1, 0],	1148	bg => [1, 1, 1, 0],
1023	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1149	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1024	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1150	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1025	),	1151	),
…		…
1048	can_hover => 1,	1174	can_hover => 1,
1049	can_events => 1,	1175	can_events => 1,
1050	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1176	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1051	;	1177	;
1052		1178
1053	$BUTTONBAR = new CFClient::UI::HBox;	1179	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1054		1180
1055	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1181	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1056	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1182	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1057	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1183	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1058	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1184	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
1062	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	1188	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
1063		1189
1064	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1190	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1065	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1191	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1066	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1192	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1067	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1193	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1194	."You can also hit the Tab-key to show/hide the Inventory.");
1068		1195
1069	$BUTTONBAR->add (new CFClient::UI::Button	1196	$BUTTONBAR->add (new CFClient::UI::Button
1070	text => "Save Config",	1197	text => "Save Config",
1071	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1198	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1072	on_activate => sub {	1199	on_activate => sub {
1073	$::CFG->{layout} = CFClient::UI::get_layout;	1200	$::CFG->{layout} = CFClient::UI::get_layout;
1074	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1201	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1075	status "Configuration Saved";	1202	status "Configuration Saved";
1076	},	1203	},
1077	);	1204	);
1078		1205
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1206	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1080	tooltip => "View Documentation");	1207	tooltip => "View Documentation");
		1208
		1209	$BUTTONBAR->add (new CFClient::UI::Flopper
		1210	text => "Bindings",
		1211	other => make_binding_window,
		1212	tooltip =>
		1213	"Lets you define, edit and delete bindings."
		1214	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1215	."with nothing set and the recording started. After doing the actions you "
		1216	."want to record press Insert and you will be asked to press a key-combo."
		1217	."After pressing the combo the binding will be saved automatically and the "
		1218	."binding editor closes"
		1219	);
1081		1220
1082	$BUTTONBAR->add (new CFClient::UI::Button	1221	$BUTTONBAR->add (new CFClient::UI::Button
1083	text => "Quit",	1222	text => "Quit",
1084	tooltip => "Terminates the program",	1223	tooltip => "Terminates the program",
1085	on_activate => sub {	1224	on_activate => sub {
…		…
1090	}	1229	}
1091	},	1230	},
1092	);	1231	);
1093		1232
1094	$BUTTONBAR->show;	1233	$BUTTONBAR->show;
		1234	$SERVER_SETUP->show;
1095		1235
1096	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1236	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1097
1098	# delay till geometry is constant
1099	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
1100	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1101	my $widget = $GAUGES->{win};
1102	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1103	});
1104	force_refresh ();
1105	}	1237	}
1106	}	1238	}
1107		1239
1108	sub video_shutdown {	1240	sub video_shutdown {
1109	undef $SDL_ACTIVE;	1241	undef $SDL_ACTIVE;
…		…
1177		1309
1178	my %demo;#d#	1310	my %demo;#d#
1179		1311
1180	sub force_refresh {	1312	sub force_refresh {
1181	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1313	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1182	debug sprintf "%3.2f", $fps;	1314	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1183		1315
1184	$CFClient::UI::ROOT->draw;	1316	$CFClient::UI::ROOT->draw;
1185		1317
1186	$WANT_REFRESH = 0;	1318	$WANT_REFRESH = 0;
1187	$CAN_REFRESH = 0;	1319	$CAN_REFRESH = 0;
…		…
1319	#############################################################################	1451	#############################################################################
1320		1452
1321	$SIG{INT} = $SIG{TERM} = sub { exit };	1453	$SIG{INT} = $SIG{TERM} = sub { exit };
1322		1454
1323	{	1455	{
1324	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1456	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1325		1457
1326	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1458	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1327	CFClient::UI::set_layout ($::CFG->{layout});	1459	CFClient::UI::set_layout ($::CFG->{layout});
1328		1460
1329	my %DEF_CFG = (	1461	my %DEF_CFG = (
1330	sdl_mode => 0,	1462	sdl_mode => 0,
1331	width => 640,	1463	width => 640,
…		…
1409		1541
1410	END { CFClient::SDL_Quit }	1542	END { CFClient::SDL_Quit }
1411		1543
1412	=head1 NAME	1544	=head1 NAME
1413		1545
1414	pclient - A Crossfire+ and Crossfire game client	1546	cfplus - A Crossfire+ and Crossfire game client
1415		1547
1416	=head1 SYNOPSIS	1548	=head1 SYNOPSIS
1417		1549
1418	Just run it - no commandline arguments are supported.	1550	Just run it - no commandline arguments are supported.
1419		1551
1420	=head1 USAGE	1552	=head1 USAGE
1421		1553
1422	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1554	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1423	fullscreen and interactively.	1555	fullscreen and interactively.
1424		1556
1425	=head1 AUTHOR	1557	=head1 AUTHOR
1426		1558
1427	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1559	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs. Revision 1.37 by elmex, Wed May 31 10:15:34 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.37 by elmex, Wed May 31 10:15:34 2006 UTC