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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.19 by elmex, Sat May 27 21:15:57 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
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_y => -1,	394	force_x => 0,
		395	force_y => "max",
391	user_w => $WIDTH,	396	force_w => $WIDTH,
392	user_h => $gh,	397	force_h => $gh,
393	);	398	);
394		399
395	$win->add (my $hbox = new CFClient::UI::HBox	400	$win->add (my $hbox = new CFClient::UI::HBox
396	children => [	401	children => [
397	(new CFClient::UI::HBox expand => 1),	402	(new CFClient::UI::HBox expand => 1),
…		…
433	&set_gauge_window_fontsize;	438	&set_gauge_window_fontsize;
434		439
435	$win	440	$win
436	}	441	}
437		442
		443
438	sub make_stats_window {	444	sub make_stats_window {
439	my $tgw = new CFClient::UI::FancyFrame	445	my $tgw = new CFClient::UI::FancyFrame
440	req_y => $HEIGHT * (2/8),	446	y => $HEIGHT * (2/8),
441	req_x => -1,	447	x => "max",
442	title => "Stats",	448	title => "Stats",
443	name => "stats_window";	449	name => "stats_window";
444		450
445	$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);
446	$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,
447	can_hover => 1, can_events => 1,	453	can_hover => 1, can_events => 1,
448	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.");
…		…
710	}	716	}
711	});	717	});
712	}	718	}
713		719
714	sub server_setup {	720	sub server_setup {
715	my $dialog = new CFClient::UI::FancyFrame	721	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
716	x => $WIDTH * (1/3),	722	x => "center",
717	y => $HEIGHT * (1/8),	723	y => "center",
718	name => "server_setup",	724	name => "server_setup",
719	title => "Server Setup",	725	title => "Server Setup",
720	child => (my $vbox = new CFClient::UI::VBox),	726	child => (my $vbox = new CFClient::UI::VBox),
721	on_visibility_change => sub {	727	;
722	$_[0]->show_centered if $_[1]
723	};
724		728
725	$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]);
726	$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");
727		731
728	{	732	{
…		…
773	}	777	}
774	);	778	);
775		779
776	$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");
777	$table->add (1, 7, new CFClient::UI::Slider	781	$table->add (1, 7, new CFClient::UI::Slider
778	req_w => 100,	782	force_w => 100,
779	range => [$CFG->{mapsize}, 10, 100, 0, 1],	783	range => [$CFG->{mapsize}, 10, 100, 0, 1],
780	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. "
781	. "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, "
782	. "but you also increase bandwidth requirements and latency. "	786	. "but you also increase bandwidth requirements and latency. "
783	. "This option is only used once at log-in.",	787	. "This option is only used once at log-in.",
…		…
832	my $window = new CFClient::UI::FancyFrame	836	my $window = new CFClient::UI::FancyFrame
833	name => "message_window",	837	name => "message_window",
834	title => "Messages",	838	title => "Messages",
835	border_bg => [1, 1, 1, 1],	839	border_bg => [1, 1, 1, 1],
836	bg => [0, 0, 0, 0.75],	840	bg => [0, 0, 0, 0.75],
837	req_x => -1,	841	x => "max",
		842	y => 0,
838	user_w => int $::WIDTH / 3,	843	force_w => $::WIDTH / 3,
839	user_h => int $::HEIGHT / 5,	844	force_h => $::HEIGHT / 5,
840	child => (my $vbox = new CFClient::UI::VBox);	845	child => (my $vbox = new CFClient::UI::VBox);
841		846
842	$vbox->add ($LOGVIEW);	847	$vbox->add ($LOGVIEW);
843		848
844	$vbox->add (my $input = new CFClient::UI::Entry	849	$vbox->add (my $input = new CFClient::UI::Entry
…		…
858	},	863	},
859	on_activate => sub {	864	on_activate => sub {
860	my ($input, $text) = @_;	865	my ($input, $text) = @_;
861	$input->set_text ('');	866	$input->set_text ('');
862		867
		868	if ($text =~ /^\/bind\s+(.*)$/) {
		869	CFClient::Binder::open_binding_dialog (sub {
		870	my ($mod, $sym) = @_;
		871	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		872	});
863	if ($text =~ /^\/(.*)/) {	873	} elsif ($text =~ /^\/(.*)/) {
864	$::CONN->user_send ($1);	874	$::CONN->user_send ($1);
865	} else {	875	} else {
866	my $say_cmd = $::CFG->{say_command} \|\| 'say';	876	my $say_cmd = $::CFG->{say_command} \|\| 'say';
867	$::CONN->user_send ("$say_cmd $text");	877	$::CONN->user_send ("$say_cmd $text");
868	}	878	}
…		…
876	},	886	},
877	);	887	);
878		888
879	$CONSOLE = {	889	$CONSOLE = {
880	window => $window,	890	window => $window,
881	input => $input	891	input => $input,
882	};	892	};
883		893
884	$window	894	$window
885	}	895	}
886		896
887	sub open_quit_dialog {	897	sub open_quit_dialog {
888	unless ($QUIT_DIALOG) {	898	unless ($QUIT_DIALOG) {
889
890	$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	;
891		904
892	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	905	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893		906
894	$vb->add (new CFClient::UI::Label	907	$vb->add (new CFClient::UI::Label
895	text => "You should find a savebed and apply it first!",	908	text => "You should find a savebed and apply it first!",
…		…
905	$hb->add (new CFClient::UI::Button	918	$hb->add (new CFClient::UI::Button
906	text => "Quit anyway",	919	text => "Quit anyway",
907	expand => 1,	920	expand => 1,
908	on_activate => sub { exit },	921	on_activate => sub { exit },
909	);	922	);
		923	}
910		924
911	$QUIT_DIALOG->show_centered;	925	$QUIT_DIALOG->show;
912	} else {
913	$QUIT_DIALOG->show_centered;
914	}
915	}	926	}
916		927
917	sub make_inventory_window {	928	sub make_inventory_window {
918	my $invwin = new CFClient::UI::FancyFrame	929	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		930	x => "center",
		931	y => "center",
919	user_w => $WIDTH * (7/8),	932	force_w => $WIDTH * 9/10,
920	user_h => $HEIGHT * (7/8),	933	force_h => $HEIGHT * 9/10,
921	title => "Inventory",	934	title => "Inventory",
922	name => "inventory_window",	935	;
		936
		937	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
		938
		939	$hb->add (my $vb1 = new CFClient::UI::VBox);
		940	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
		941	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
		942
		943	$hb->add (my $vb2 = new CFClient::UI::VBox);
		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,
923	on_visibility_change => sub {	1010	on_visibility_change => sub {
924	$_[0]->show_centered if $_[1]	1011	my ($self, $visible) = @_;
		1012	$refresh->() if $visible;
925	};	1013	};
926		1014
927	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
928
929	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	1015	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
930	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	1016	$vb->add ($binding_list);
931	$lbl->set_text ("Player");
932	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
933
934	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
935
936	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1017	$vb->add (my $hb = new CFClient::UI::HBox);
937	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
938	$hb2->add (new CFClient::UI::Button	1018	$hb->add (new CFClient::UI::Button
939	text => "Close",	1019	text => "record new",
940	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.",
941	on_activate => sub {	1022	on_activate => sub {
942	$CONN->send ("apply $CONN->{open_container}")	1023	$::BIND_EDITOR->set_binding (undef, undef, [],
943	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;
944	},	1035	},
945	);	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	);
946		1045
947	$INVR_LBL->set_text ("Floor");	1046	$refresh->();
948	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1047	$BIND_WINDOW
949
950	$invwin
951	}	1048	}
952		1049
953	sub make_help_window {	1050	sub make_help_window {
954	my $win = new CFClient::UI::FancyFrame	1051	my $win = new CFClient::UI::FancyFrame
955	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";
956		1055
957	$win->add (my $vbox = new CFClient::UI::VBox);	1056	$win->add (my $vbox = new CFClient::UI::VBox);
958		1057
959	$vbox->add (my $buttons = new CFClient::UI::HBox);	1058	$vbox->add (my $buttons = new CFClient::UI::HBox);
960	$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);
…		…
1021	if ($DEBUG_STATUS) {	1120	if ($DEBUG_STATUS) {
1022	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1121	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023	} else {	1122	} else {
1024	# create the widgets	1123	# create the widgets
1025		1124
1026	$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;
1027	$DEBUG_STATUS->show;	1130	$DEBUG_STATUS->show;
1028		1131
		1132	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1133
1029	$STATUSBOX = new CFClient::UI::Statusbox;	1134	$STATUSBOX = new CFClient::UI::Statusbox;
1030	$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]);
1031		1136
1032	(new CFClient::UI::Frame	1137	(new CFClient::UI::Frame
1033	bg => [0, 0, 0, 0.4],	1138	bg => [0, 0, 0, 0.4],
1034	req_y => -1,	1139	force_x => 0,
		1140	force_y => "max",
1035	child => $STATUSBOX,	1141	child => $STATUSBOX,
1036	)->show;	1142	)->show;
1037		1143
1038	CFClient::UI::FancyFrame->new (	1144	CFClient::UI::FancyFrame->new (
		1145	x => 0,
		1146	y => $FONTSIZE + 8,
1039	border_bg => [1, 1, 1, 192/255],	1147	border_bg => [1, 1, 1, 192/255],
1040	bg => [1, 1, 1, 0],	1148	bg => [1, 1, 1, 0],
1041	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1149	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1042	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.",
1043	),	1151	),
…		…
1066	can_hover => 1,	1174	can_hover => 1,
1067	can_events => 1,	1175	can_events => 1,
1068	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.",
1069	;	1177	;
1070		1178
1071	$BUTTONBAR = new CFClient::UI::HBox;	1179	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1072		1180
1073	$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,
1074	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.");
1075	$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,
1076	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.");
…		…
1080	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
1081		1189
1082	$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,
1083	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.");
1084	$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,
1085	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.");
1086		1195
1087	$BUTTONBAR->add (new CFClient::UI::Button	1196	$BUTTONBAR->add (new CFClient::UI::Button
1088	text => "Save Config",	1197	text => "Save Config",
1089	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.",
1090	on_activate => sub {	1199	on_activate => sub {
1091	$::CFG->{layout} = CFClient::UI::get_layout;	1200	$::CFG->{layout} = CFClient::UI::get_layout;
1092	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1201	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093	status "Configuration Saved";	1202	status "Configuration Saved";
1094	},	1203	},
1095	);	1204	);
1096		1205
1097	$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,
1098	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	);
1099		1220
1100	$BUTTONBAR->add (new CFClient::UI::Button	1221	$BUTTONBAR->add (new CFClient::UI::Button
1101	text => "Quit",	1222	text => "Quit",
1102	tooltip => "Terminates the program",	1223	tooltip => "Terminates the program",
1103	on_activate => sub {	1224	on_activate => sub {
…		…
1108	}	1229	}
1109	},	1230	},
1110	);	1231	);
1111		1232
1112	$BUTTONBAR->show;	1233	$BUTTONBAR->show;
		1234	$SERVER_SETUP->show;
1113		1235
1114	$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]);
1115
1116	# delay till geometry is constant
1117	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
1118	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1119	my $widget = $GAUGES->{win};
1120	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1121	});
1122	force_refresh ();
1123	}	1237	}
1124	}	1238	}
1125		1239
1126	sub video_shutdown {	1240	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1241	undef $SDL_ACTIVE;
…		…
1195		1309
1196	my %demo;#d#	1310	my %demo;#d#
1197		1311
1198	sub force_refresh {	1312	sub force_refresh {
1199	$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;
1200	debug sprintf "%3.2f", $fps;	1314	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1315
1202	$CFClient::UI::ROOT->draw;	1316	$CFClient::UI::ROOT->draw;
1203		1317
1204	$WANT_REFRESH = 0;	1318	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1319	$CAN_REFRESH = 0;
…		…
1337	#############################################################################	1451	#############################################################################
1338		1452
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1453	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1454
1341	{	1455	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1456	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1343		1457
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1458	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1459	CFClient::UI::set_layout ($::CFG->{layout});
1346		1460
1347	my %DEF_CFG = (	1461	my %DEF_CFG = (
1348	sdl_mode => 0,	1462	sdl_mode => 0,
1349	width => 640,	1463	width => 640,
…		…
1427		1541
1428	END { CFClient::SDL_Quit }	1542	END { CFClient::SDL_Quit }
1429		1543
1430	=head1 NAME	1544	=head1 NAME
1431		1545
1432	pclient - A Crossfire+ and Crossfire game client	1546	cfplus - A Crossfire+ and Crossfire game client
1433		1547
1434	=head1 SYNOPSIS	1548	=head1 SYNOPSIS
1435		1549
1436	Just run it - no commandline arguments are supported.	1550	Just run it - no commandline arguments are supported.
1437		1551
1438	=head1 USAGE	1552	=head1 USAGE
1439		1553
1440	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
1441	fullscreen and interactively.	1555	fullscreen and interactively.
1442		1556
1443	=head1 AUTHOR	1557	=head1 AUTHOR
1444		1558
1445	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.19 by elmex, Sat May 27 21:15:57 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.19 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.37 by elmex, Wed May 31 10:15:34 2006 UTC