[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.35 by elmex, Tue May 30 14:45:56 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
182	req_x => 1,	185	x => 1,
183	req_y => $HEIGHT * (1/8),	186	y => $HEIGHT * (1/8),
184	name => "client_setup",	187	name => "client_setup",
185	title => "Client Setup",	188	title => "Client Setup",
186	child => (my $vbox = new CFClient::UI::VBox);	189	child => (my $vbox = new CFClient::UI::VBox);
		190
187	$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]);
188		192
189	$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");
190	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	194	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191		195
192	$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]);
193	$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");
194		198
195	$mode_slider->connect (changed => sub {	199	$mode_slider->connect (changed => sub {
196	my ($self, $value) = @_;	200	my ($self, $value) = @_;
197		201
…		…
385		389
386	sub make_gauge_window {	390	sub make_gauge_window {
387	my $gh = int $HEIGHT * $CFG->{gauge_size};	391	my $gh = int $HEIGHT * $CFG->{gauge_size};
388		392
389	my $win = new CFClient::UI::Frame (	393	my $win = new CFClient::UI::Frame (
390	req_x => 0,	394	force_x => 0,
391	req_y => -1,	395	force_y => "max",
392	def_w => $WIDTH,	396	force_w => $WIDTH,
393	def_h => $gh,	397	force_h => $gh,
394	);	398	);
395		399
396	$win->add (my $hbox = new CFClient::UI::HBox	400	$win->add (my $hbox = new CFClient::UI::HBox
397	children => [	401	children => [
398	(new CFClient::UI::HBox expand => 1),	402	(new CFClient::UI::HBox expand => 1),
…		…
434	&set_gauge_window_fontsize;	438	&set_gauge_window_fontsize;
435		439
436	$win	440	$win
437	}	441	}
438		442
		443
439	sub make_stats_window {	444	sub make_stats_window {
440	my $tgw = new CFClient::UI::FancyFrame	445	my $tgw = new CFClient::UI::FancyFrame
441	req_y => $HEIGHT * (2/8),	446	y => $HEIGHT * (2/8),
442	req_x => -1,	447	x => "max",
443	title => "Stats",	448	title => "Stats",
444	name => "stats_window";	449	name => "stats_window";
445		450
446	$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);
447	$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,
448	can_hover => 1, can_events => 1,	453	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.");	454	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
711	}	716	}
712	});	717	});
713	}	718	}
714		719
715	sub server_setup {	720	sub server_setup {
716	my $dialog = new CFClient::UI::FancyFrame	721	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
717	x => $WIDTH * (1/3),	722	x => "center",
718	y => $HEIGHT * (1/8),	723	y => "center",
719	name => "server_setup",	724	name => "server_setup",
720	title => "Server Setup",	725	title => "Server Setup",
721	child => (my $vbox = new CFClient::UI::VBox),	726	child => (my $vbox = new CFClient::UI::VBox),
722	on_visibility_change => sub {
723	my ($self, $visible) = @_;
724	$self->center if $visible;
725	},
726	;	727	;
727		728
728	$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]);
729	$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");
730		731
…		…
776	}	777	}
777	);	778	);
778		779
779	$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");
780	$table->add (1, 7, new CFClient::UI::Slider	781	$table->add (1, 7, new CFClient::UI::Slider
781	req_w => 100,	782	force_w => 100,
782	range => [$CFG->{mapsize}, 10, 100, 0, 1],	783	range => [$CFG->{mapsize}, 10, 100, 0, 1],
783	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. "
784	. "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, "
785	. "but you also increase bandwidth requirements and latency. "	786	. "but you also increase bandwidth requirements and latency. "
786	. "This option is only used once at log-in.",	787	. "This option is only used once at log-in.",
…		…
835	my $window = new CFClient::UI::FancyFrame	836	my $window = new CFClient::UI::FancyFrame
836	name => "message_window",	837	name => "message_window",
837	title => "Messages",	838	title => "Messages",
838	border_bg => [1, 1, 1, 1],	839	border_bg => [1, 1, 1, 1],
839	bg => [0, 0, 0, 0.75],	840	bg => [0, 0, 0, 0.75],
840	req_x => -1,	841	x => "max",
841	req_y => 0,	842	y => 0,
842	def_w => int $::WIDTH / 3,	843	force_w => $::WIDTH / 3,
843	def_h => int $::HEIGHT / 5,	844	force_h => $::HEIGHT / 5,
844	child => (my $vbox = new CFClient::UI::VBox);	845	child => (my $vbox = new CFClient::UI::VBox);
845		846
846	$vbox->add ($LOGVIEW);	847	$vbox->add ($LOGVIEW);
847		848
848	$vbox->add (my $input = new CFClient::UI::Entry	849	$vbox->add (my $input = new CFClient::UI::Entry
…		…
862	},	863	},
863	on_activate => sub {	864	on_activate => sub {
864	my ($input, $text) = @_;	865	my ($input, $text) = @_;
865	$input->set_text ('');	866	$input->set_text ('');
866		867
		868	if ($text =~ /^\/bind\s+(.*)$/) {
		869	CFClient::Binder::open_binding_dialog (sub {
		870	my ($mod, $sym) = @_;
		871	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		872	});
867	if ($text =~ /^\/(.*)/) {	873	} elsif ($text =~ /^\/(.*)/) {
868	$::CONN->user_send ($1);	874	$::CONN->user_send ($1);
869	} else {	875	} else {
870	my $say_cmd = $::CFG->{say_command} \|\| 'say';	876	my $say_cmd = $::CFG->{say_command} \|\| 'say';
871	$::CONN->user_send ("$say_cmd $text");	877	$::CONN->user_send ("$say_cmd $text");
872	}	878	}
…		…
880	},	886	},
881	);	887	);
882		888
883	$CONSOLE = {	889	$CONSOLE = {
884	window => $window,	890	window => $window,
885	input => $input	891	input => $input,
886	};	892	};
887		893
888	$window	894	$window
889	}	895	}
890		896
891	sub open_quit_dialog {	897	sub open_quit_dialog {
892	unless ($QUIT_DIALOG) {	898	unless ($QUIT_DIALOG) {
893	$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	;
894		904
895	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	905	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
896		906
897	$vb->add (new CFClient::UI::Label	907	$vb->add (new CFClient::UI::Label
898	text => "You should find a savebed and apply it first!",	908	text => "You should find a savebed and apply it first!",
…		…
911	on_activate => sub { exit },	921	on_activate => sub { exit },
912	);	922	);
913	}	923	}
914		924
915	$QUIT_DIALOG->show;	925	$QUIT_DIALOG->show;
916	$QUIT_DIALOG->center;
917	}	926	}
918		927
919	sub make_inventory_window {	928	sub make_inventory_window {
920	my $invwin = new CFClient::UI::FancyFrame	929	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		930	x => "center",
		931	y => "center",
921	def_w => $WIDTH * 7/8,	932	force_w => $WIDTH * 9/10,
922	def_h => $HEIGHT * 7/8,	933	force_h => $HEIGHT * 9/10,
923	title => "Inventory",	934	title => "Inventory",
924	name => "inventory_window",	935	name => "inventory_window",
925	on_visibility_change => sub {
926	my ($self, $visible) = @_;
927	$self->center if $visible;
928	},
929	;	936	;
930		937
931	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	938	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
932		939
933	$hb->add (my $vb1 = new CFClient::UI::VBox);	940	$hb->add (my $vb1 = new CFClient::UI::VBox);
934	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	941	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
935	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	942	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
936		943
937	$hb->add (my $vb2 = new CFClient::UI::VBox);	944	$hb->add (my $vb2 = new CFClient::UI::VBox);
938		945
		946	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		947
		948	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		949
		950	# XXX: Call after $INVR = ... because set_opencont sets the items
		951	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		952
		953	$invwin
		954	}
		955
		956	sub make_binding_window {
		957	my $binding_list = new CFClient::UI::VBox;
		958
		959	my $refresh;
		960	$refresh = sub {
		961	$binding_list->clear ();
		962
		963	for my $mod (keys %{$::CFG->{bindings}}) {
		964	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		965	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		966	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		967
		968	my $lbl = join "; ", @$cmds;
		969	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		970	$binding_list->add (my $hb = new CFClient::UI::HBox);
		971	$hb->add (new CFClient::UI::Button
		972	text => "delete",
		973	tooltip => "Deletes the binding",
		974	on_activate => sub {
		975	$binding_list->remove ($hb);
		976	delete $::CFG->{bindings}->{$mod}->{$sym};
		977	});
		978
		979	$hb->add (new CFClient::UI::Button
		980	text => "edit",
		981	tooltip => "Edits the binding",
		982	on_activate => sub {
		983	$::BIND_EDITOR->set_binding (
		984	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		985	sub {
		986	my ($nmod, $nsym, $ncmds) = @_;
		987	delete $::CFG->{bindings}->{$mod}->{$sym};
		988	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		989	$refresh->();
		990	$::BIND_WINDOW->show;
		991	},
		992	sub {
		993	$::BIND_WINDOW->show;
		994	});
		995	$::BIND_EDITOR->show;
		996	$::BIND_WINDOW->hide;
		997	});
		998
		999	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1000	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1001	}
		1002	}
		1003	};
		1004
		1005	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1006	title => "Bindings",
		1007	x => "center",
		1008	y => "center",
		1009	def_w => int $WIDTH * 9/10,
		1010	def_h => int $HEIGHT * 9/10,
		1011	on_visibility_change => sub {
		1012	my ($self, $visible) = @_;
		1013	$refresh->() if $visible;
		1014	};
		1015
		1016	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1017	$vb->add ($binding_list);
939	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1018	$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	1019	$hb->add (new CFClient::UI::Button
942	text => "Close",	1020	text => "record new",
943	tooltip => "Close the currently open container (if one is open)",	1021	expand => 1,
		1022	tooltip => "This button opens the binding editor with an empty binding.",
944	on_activate => sub {	1023	on_activate => sub {
945	$CONN->send ("apply $CONN->{open_container}")	1024	$::BIND_EDITOR->set_binding (undef, undef, [],
946	if $CONN->{open_container} != 0;	1025	sub {
		1026	my ($mod, $sym, $cmds) = @_;
		1027	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1028	$refresh->();
		1029	$::BIND_WINDOW->show;
		1030	},
		1031	sub {
		1032	$::BIND_WINDOW->show;
		1033	});
		1034	$::BIND_WINDOW->hide;
		1035	$::BIND_EDITOR->show;
947	},	1036	},
948	);	1037	);
		1038	$hb->add (new CFClient::UI::Button
		1039	text => "close",
		1040	tooltip => "Closes the binding window",
		1041	expand => 1,
		1042	on_activate => sub {
		1043	$::BIND_WINDOW->hide;
		1044	}
		1045	);
949		1046
950	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1047	$refresh->();
951		1048	$BIND_WINDOW
952	$invwin
953	}	1049	}
954		1050
955	sub make_help_window {	1051	sub make_help_window {
956	my $win = new CFClient::UI::FancyFrame	1052	my $win = new CFClient::UI::FancyFrame
957	def_w => int $WIDTH * 7/8,	1053	def_w => int $WIDTH * 7/8,
…		…
1025	if ($DEBUG_STATUS) {	1121	if ($DEBUG_STATUS) {
1026	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1122	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027	} else {	1123	} else {
1028	# create the widgets	1124	# create the widgets
1029		1125
1030	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1126	$DEBUG_STATUS = new CFClient::UI::Label
		1127	padding => 0,
		1128	z => 100,
		1129	force_x => "max",
		1130	force_y => 0;
1031	$DEBUG_STATUS->show;	1131	$DEBUG_STATUS->show;
1032		1132
		1133	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1134
1033	$STATUSBOX = new CFClient::UI::Statusbox;	1135	$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]);	1136	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1035		1137
1036	(new CFClient::UI::Frame	1138	(new CFClient::UI::Frame
1037	bg => [0, 0, 0, 0.4],	1139	bg => [0, 0, 0, 0.4],
1038	req_y => -1,	1140	force_x => 0,
		1141	force_y => "max",
1039	child => $STATUSBOX,	1142	child => $STATUSBOX,
1040	)->show;	1143	)->show;
1041		1144
1042	CFClient::UI::FancyFrame->new (	1145	CFClient::UI::FancyFrame->new (
		1146	x => 0,
		1147	y => $FONTSIZE + 8,
1043	border_bg => [1, 1, 1, 192/255],	1148	border_bg => [1, 1, 1, 192/255],
1044	bg => [1, 1, 1, 0],	1149	bg => [1, 1, 1, 0],
1045	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1150	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.",	1151	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047	),	1152	),
…		…
1070	can_hover => 1,	1175	can_hover => 1,
1071	can_events => 1,	1176	can_events => 1,
1072	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1177	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1073	;	1178	;
1074		1179
1075	$BUTTONBAR = new CFClient::UI::HBox;	1180	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1076		1181
1077	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1182	$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.");	1183	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,	1184	$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.");	1185	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
1091	$BUTTONBAR->add (new CFClient::UI::Button	1196	$BUTTONBAR->add (new CFClient::UI::Button
1092	text => "Save Config",	1197	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.",	1198	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 {	1199	on_activate => sub {
1095	$::CFG->{layout} = CFClient::UI::get_layout;	1200	$::CFG->{layout} = CFClient::UI::get_layout;
1096	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1201	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097	status "Configuration Saved";	1202	status "Configuration Saved";
1098	},	1203	},
1099	);	1204	);
1100		1205
1101	$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,
1102	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	);
1103		1220
1104	$BUTTONBAR->add (new CFClient::UI::Button	1221	$BUTTONBAR->add (new CFClient::UI::Button
1105	text => "Quit",	1222	text => "Quit",
1106	tooltip => "Terminates the program",	1223	tooltip => "Terminates the program",
1107	on_activate => sub {	1224	on_activate => sub {
…		…
1112	}	1229	}
1113	},	1230	},
1114	);	1231	);
1115		1232
1116	$BUTTONBAR->show;	1233	$BUTTONBAR->show;
		1234	$SERVER_SETUP->show;
1117		1235
1118	$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]);
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	}	1237	}
1128	}	1238	}
1129		1239
1130	sub video_shutdown {	1240	sub video_shutdown {
1131	undef $SDL_ACTIVE;	1241	undef $SDL_ACTIVE;
…		…
1199		1309
1200	my %demo;#d#	1310	my %demo;#d#
1201		1311
1202	sub force_refresh {	1312	sub force_refresh {
1203	$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;
1204	debug sprintf "%3.2f", $fps;	1314	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1205		1315
1206	$CFClient::UI::ROOT->draw;	1316	$CFClient::UI::ROOT->draw;
1207		1317
1208	$WANT_REFRESH = 0;	1318	$WANT_REFRESH = 0;
1209	$CAN_REFRESH = 0;	1319	$CAN_REFRESH = 0;
…		…
1341	#############################################################################	1451	#############################################################################
1342		1452
1343	$SIG{INT} = $SIG{TERM} = sub { exit };	1453	$SIG{INT} = $SIG{TERM} = sub { exit };
1344		1454
1345	{	1455	{
1346	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1456	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1347		1457
1348	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1458	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1349	CFClient::UI::set_layout ($::CFG->{layout});	1459	CFClient::UI::set_layout ($::CFG->{layout});
1350		1460
1351	my %DEF_CFG = (	1461	my %DEF_CFG = (
1352	sdl_mode => 0,	1462	sdl_mode => 0,
1353	width => 640,	1463	width => 640,
…		…
1431		1541
1432	END { CFClient::SDL_Quit }	1542	END { CFClient::SDL_Quit }
1433		1543
1434	=head1 NAME	1544	=head1 NAME
1435		1545
1436	pclient - A Crossfire+ and Crossfire game client	1546	cfplus - A Crossfire+ and Crossfire game client
1437		1547
1438	=head1 SYNOPSIS	1548	=head1 SYNOPSIS
1439		1549
1440	Just run it - no commandline arguments are supported.	1550	Just run it - no commandline arguments are supported.
1441		1551
1442	=head1 USAGE	1552	=head1 USAGE
1443		1553
1444	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
1445	fullscreen and interactively.	1555	fullscreen and interactively.
1446		1556
1447	=head1 AUTHOR	1557	=head1 AUTHOR
1448		1558
1449	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.21 by root, Sun May 28 01:16:04 2006 UTC vs. Revision 1.35 by elmex, Tue May 30 14:45:56 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.35 by elmex, Tue May 30 14:45:56 2006 UTC