[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.31 by root, Tue May 30 02:22:03 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;
105		109
106	sub status {	110	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	111	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	112	}
109		113
110	sub debug {	114	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	115	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	116	}
115		117
116	sub start_game {	118	sub start_game {
117	status "logging in...";	119	status "logging in...";
		120
		121	$LOGIN_BUTTON->set_text ("Logout");
		122	$SERVER_SETUP->hide;
118		123
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	124	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		125
121	my ($host, $port) = split /:/, $CFG->{host};	126	my ($host, $port) = split /:/, $CFG->{host};
122		127
…		…
151	};	156	};
152		157
153	if ($CONN) {	158	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	159	CFClient::lowdelay fileno $CONN->{fh};
155		160
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	161	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	162	} else {
163	status "unable to connect";	163	status "unable to connect";
164	stop_game();	164	stop_game();
165	}	165	}
166	}	166	}
167		167
168	sub stop_game {	168	sub stop_game {
		169	$LOGIN_BUTTON->set_text ("Login");
		170	$SERVER_SETUP->show;
		171	$INV_WINDOW->hide;
		172	$LOGVIEW->hide;
		173
169	return unless $CONN;	174	return unless $CONN;
170		175
171	status "connection closed";	176	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	177
173	$CONN->destroy;	178	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	179	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	180	}
179		181
180	sub client_setup {	182	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	183	my $dialog = new CFClient::UI::FancyFrame
182	req_x => 1,	184	x => 1,
183	req_y => $HEIGHT * (1/8),	185	y => $HEIGHT * (1/8),
184	name => "client_setup",	186	name => "client_setup",
185	title => "Client Setup",	187	title => "Client Setup",
186	child => (my $vbox = new CFClient::UI::VBox);	188	child => (my $vbox = new CFClient::UI::VBox);
		189
187	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	190	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188		191
189	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	192	$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);	193	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191		194
192	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	195	$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");	196	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194		197
195	$mode_slider->connect (changed => sub {	198	$mode_slider->connect (changed => sub {
196	my ($self, $value) = @_;	199	my ($self, $value) = @_;
197		200
…		…
385		388
386	sub make_gauge_window {	389	sub make_gauge_window {
387	my $gh = int $HEIGHT * $CFG->{gauge_size};	390	my $gh = int $HEIGHT * $CFG->{gauge_size};
388		391
389	my $win = new CFClient::UI::Frame (	392	my $win = new CFClient::UI::Frame (
390	req_y => -1,	393	force_x => 0,
		394	force_y => "max",
391	user_w => $WIDTH,	395	force_w => $WIDTH,
392	user_h => $gh,	396	force_h => $gh,
393	);	397	);
394		398
395	$win->add (my $hbox = new CFClient::UI::HBox	399	$win->add (my $hbox = new CFClient::UI::HBox
396	children => [	400	children => [
397	(new CFClient::UI::HBox expand => 1),	401	(new CFClient::UI::HBox expand => 1),
…		…
433	&set_gauge_window_fontsize;	437	&set_gauge_window_fontsize;
434		438
435	$win	439	$win
436	}	440	}
437		441
		442
438	sub make_stats_window {	443	sub make_stats_window {
439	my $tgw = new CFClient::UI::FancyFrame	444	my $tgw = new CFClient::UI::FancyFrame
440	req_y => $HEIGHT * (2/8),	445	y => $HEIGHT * (2/8),
441	req_x => -1,	446	x => "max",
442	title => "Stats",	447	title => "Stats",
443	name => "stats_window";	448	name => "stats_window";
444		449
445	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	450	$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,	451	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
447	can_hover => 1, can_events => 1,	452	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.");	453	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
710	}	715	}
711	});	716	});
712	}	717	}
713		718
714	sub server_setup {	719	sub server_setup {
715	my $dialog = new CFClient::UI::FancyFrame	720	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
716	x => $WIDTH * (1/3),	721	x => "center",
717	y => $HEIGHT * (1/8),	722	y => "center",
718	name => "server_setup",	723	name => "server_setup",
719	title => "Server Setup",	724	title => "Server Setup",
720	child => (my $vbox = new CFClient::UI::VBox),	725	child => (my $vbox = new CFClient::UI::VBox),
721	on_visibility_change => sub {	726	;
722	$_[0]->show_centered if $_[1]
723	};
724		727
725	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	728	$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");	729	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
727		730
728	{	731	{
…		…
773	}	776	}
774	);	777	);
775		778
776	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	779	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
777	$table->add (1, 7, new CFClient::UI::Slider	780	$table->add (1, 7, new CFClient::UI::Slider
778	req_w => 100,	781	force_w => 100,
779	range => [$CFG->{mapsize}, 10, 100, 0, 1],	782	range => [$CFG->{mapsize}, 10, 100, 0, 1],
780	tooltip => "This is the size of the portion of the map update the server sends you. "	783	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, "	784	. "If you set this to a high value you will be able to see further, "
782	. "but you also increase bandwidth requirements and latency. "	785	. "but you also increase bandwidth requirements and latency. "
783	. "This option is only used once at log-in.",	786	. "This option is only used once at log-in.",
…		…
832	my $window = new CFClient::UI::FancyFrame	835	my $window = new CFClient::UI::FancyFrame
833	name => "message_window",	836	name => "message_window",
834	title => "Messages",	837	title => "Messages",
835	border_bg => [1, 1, 1, 1],	838	border_bg => [1, 1, 1, 1],
836	bg => [0, 0, 0, 0.75],	839	bg => [0, 0, 0, 0.75],
837	req_x => -1,	840	x => "max",
		841	y => 0,
838	user_w => int $::WIDTH / 3,	842	force_w => $::WIDTH / 3,
839	user_h => int $::HEIGHT / 5,	843	force_h => $::HEIGHT / 5,
840	child => (my $vbox = new CFClient::UI::VBox);	844	child => (my $vbox = new CFClient::UI::VBox);
841		845
842	$vbox->add ($LOGVIEW);	846	$vbox->add ($LOGVIEW);
843		847
844	$vbox->add (my $input = new CFClient::UI::Entry	848	$vbox->add (my $input = new CFClient::UI::Entry
…		…
858	},	862	},
859	on_activate => sub {	863	on_activate => sub {
860	my ($input, $text) = @_;	864	my ($input, $text) = @_;
861	$input->set_text ('');	865	$input->set_text ('');
862		866
		867	if ($text =~ /^\/bind\s+(.*)$/) {
		868	CFClient::Recorder::open_binding_dialog ([$1]);
863	if ($text =~ /^\/(.*)/) {	869	} elsif ($text =~ /^\/(.*)/) {
864	$::CONN->user_send ($1);	870	$::CONN->user_send ($1);
865	} else {	871	} else {
866	my $say_cmd = $::CFG->{say_command} \|\| 'say';	872	my $say_cmd = $::CFG->{say_command} \|\| 'say';
867	$::CONN->user_send ("$say_cmd $text");	873	$::CONN->user_send ("$say_cmd $text");
868	}	874	}
…		…
876	},	882	},
877	);	883	);
878		884
879	$CONSOLE = {	885	$CONSOLE = {
880	window => $window,	886	window => $window,
881	input => $input	887	input => $input,
882	};	888	};
883		889
884	$window	890	$window
885	}	891	}
886		892
887	sub open_quit_dialog {	893	sub open_quit_dialog {
888	unless ($QUIT_DIALOG) {	894	unless ($QUIT_DIALOG) {
889
890	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	895	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		896	x => "center",
		897	y => "center",
		898	title => "Really Quit?",
		899	;
891		900
892	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	901	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893		902
894	$vb->add (new CFClient::UI::Label	903	$vb->add (new CFClient::UI::Label
895	text => "You should find a savebed and apply it first!",	904	text => "You should find a savebed and apply it first!",
…		…
905	$hb->add (new CFClient::UI::Button	914	$hb->add (new CFClient::UI::Button
906	text => "Quit anyway",	915	text => "Quit anyway",
907	expand => 1,	916	expand => 1,
908	on_activate => sub { exit },	917	on_activate => sub { exit },
909	);	918	);
		919	}
910		920
911	$QUIT_DIALOG->show_centered;	921	$QUIT_DIALOG->show;
912	} else {
913	$QUIT_DIALOG->show_centered;
914	}
915	}	922	}
916		923
917	sub make_inventory_window {	924	sub make_inventory_window {
918	my $invwin = new CFClient::UI::FancyFrame	925	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		926	x => "center",
		927	y => "center",
919	user_w => $WIDTH * (7/8),	928	def_w => $WIDTH * 9/10,
920	user_h => $HEIGHT * (7/8),	929	def_h => $HEIGHT * 9/10,
921	title => "Inventory",	930	title => "Inventory",
922	name => "inventory_window",	931	name => "inventory_window",
		932	;
		933
		934	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
		935
		936	$hb->add (my $vb1 = new CFClient::UI::VBox);
		937	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
		938	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
		939
		940	$hb->add (my $vb2 = new CFClient::UI::VBox);
		941
		942	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		943
		944	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		945
		946	# XXX: Call after $INVR = ... because set_opencont sets the items
		947	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		948
		949	$invwin
		950	}
		951
		952	sub make_binding_window {
		953	my $binding_list = new CFClient::UI::VBox;
		954
		955	my $refresh = sub {
		956	$binding_list->clear ();
		957
		958	for my $mod (keys %{$::CFG->{bindings}}) {
		959	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		960	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		961	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		962
		963	my $lbl = join "; ", @$cmds;
		964	my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
		965	$binding_list->add (my $hb = new CFClient::UI::HBox);
		966	$hb->add (new CFClient::UI::Button
		967	text => "delete",
		968	on_activate => sub {
		969	$binding_list->remove ($hb);
		970	delete $::CFG->{bindings}->{$mod}->{$sym};
		971	});
		972	$hb->add (new CFClient::UI::Label text => "($nam)");
		973	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		974	}
		975	}
		976	};
		977
		978	$BIND_WINDOW = new CFClient::UI::FancyFrame
		979	title => "Bindings",
		980	x => "center",
		981	y => "center",
		982	def_w => int $WIDTH * 9/10,
		983	def_h => int $HEIGHT * 9/10,
923	on_visibility_change => sub {	984	on_visibility_change => sub {
924	$_[0]->show_centered if $_[1]	985	my ($self, $visible) = @_;
		986	$refresh->() if $visible;
925	};	987	};
926		988
927	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	989	$BIND_WINDOW->add ($binding_list);
928		990	$refresh->();
929	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	991	$BIND_WINDOW
930	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);
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);
937	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
938	$hb2->add (new CFClient::UI::Button
939	text => "Close",
940	tooltip => "Close the currently open container (if one is open)",
941	on_activate => sub {
942	$CONN->send ("apply $CONN->{open_container}")
943	if $CONN->{open_container} != 0;
944	},
945	);
946
947	$INVR_LBL->set_text ("Floor");
948	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
949
950	$invwin
951	}	992	}
952		993
953	sub make_help_window {	994	sub make_help_window {
954	my $win = new CFClient::UI::FancyFrame	995	my $win = new CFClient::UI::FancyFrame
955	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	996	def_w => int $WIDTH * 7/8,
		997	def_h => int $HEIGHT * 7/8,
		998	title => "Documentation";
956		999
957	$win->add (my $vbox = new CFClient::UI::VBox);	1000	$win->add (my $vbox = new CFClient::UI::VBox);
958		1001
959	$vbox->add (my $buttons = new CFClient::UI::HBox);	1002	$vbox->add (my $buttons = new CFClient::UI::HBox);
960	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1003	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1021	if ($DEBUG_STATUS) {	1064	if ($DEBUG_STATUS) {
1022	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1065	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023	} else {	1066	} else {
1024	# create the widgets	1067	# create the widgets
1025		1068
1026	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1069	$DEBUG_STATUS = new CFClient::UI::Label
		1070	padding => 0,
		1071	z => 100,
		1072	force_x => "max",
		1073	force_y => 0;
1027	$DEBUG_STATUS->show;	1074	$DEBUG_STATUS->show;
1028		1075
1029	$STATUSBOX = new CFClient::UI::Statusbox;	1076	$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]);	1077	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1031		1078
1032	(new CFClient::UI::Frame	1079	(new CFClient::UI::Frame
1033	bg => [0, 0, 0, 0.4],	1080	bg => [0, 0, 0, 0.4],
1034	req_y => -1,	1081	force_x => 0,
		1082	force_y => "max",
1035	child => $STATUSBOX,	1083	child => $STATUSBOX,
1036	)->show;	1084	)->show;
1037		1085
1038	CFClient::UI::FancyFrame->new (	1086	CFClient::UI::FancyFrame->new (
		1087	x => 0,
		1088	y => $FONTSIZE + 8,
1039	border_bg => [1, 1, 1, 192/255],	1089	border_bg => [1, 1, 1, 192/255],
1040	bg => [1, 1, 1, 0],	1090	bg => [1, 1, 1, 0],
1041	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1091	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.",	1092	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1043	),	1093	),
…		…
1066	can_hover => 1,	1116	can_hover => 1,
1067	can_events => 1,	1117	can_events => 1,
1068	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1118	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1069	;	1119	;
1070		1120
1071	$BUTTONBAR = new CFClient::UI::HBox;	1121	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1072		1122
1073	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1123	$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.");	1124	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,	1125	$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.");	1126	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
1087	$BUTTONBAR->add (new CFClient::UI::Button	1137	$BUTTONBAR->add (new CFClient::UI::Button
1088	text => "Save Config",	1138	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.",	1139	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 {	1140	on_activate => sub {
1091	$::CFG->{layout} = CFClient::UI::get_layout;	1141	$::CFG->{layout} = CFClient::UI::get_layout;
1092	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1142	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093	status "Configuration Saved";	1143	status "Configuration Saved";
1094	},	1144	},
1095	);	1145	);
1096		1146
1097	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1147	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1098	tooltip => "View Documentation");	1148	tooltip => "View Documentation");
		1149
		1150	$BUTTONBAR->add (new CFClient::UI::Flopper
		1151	text => "Bindings",
		1152	other => make_binding_window,
		1153	tooltip => "Lets you delete bindings you have made with the recorder"
		1154	);
		1155	$BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
		1156	tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1099		1157
1100	$BUTTONBAR->add (new CFClient::UI::Button	1158	$BUTTONBAR->add (new CFClient::UI::Button
1101	text => "Quit",	1159	text => "Quit",
1102	tooltip => "Terminates the program",	1160	tooltip => "Terminates the program",
1103	on_activate => sub {	1161	on_activate => sub {
…		…
1108	}	1166	}
1109	},	1167	},
1110	);	1168	);
1111		1169
1112	$BUTTONBAR->show;	1170	$BUTTONBAR->show;
		1171	$SERVER_SETUP->show;
1113		1172
1114	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1173	$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	}	1174	}
1124	}	1175	}
1125		1176
1126	sub video_shutdown {	1177	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1178	undef $SDL_ACTIVE;
…		…
1337	#############################################################################	1388	#############################################################################
1338		1389
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1390	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1391
1341	{	1392	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1393	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1343		1394
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1395	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1396	CFClient::UI::set_layout ($::CFG->{layout});
1346		1397
1347	my %DEF_CFG = (	1398	my %DEF_CFG = (
1348	sdl_mode => 0,	1399	sdl_mode => 0,
1349	width => 640,	1400	width => 640,
…		…
1427		1478
1428	END { CFClient::SDL_Quit }	1479	END { CFClient::SDL_Quit }
1429		1480
1430	=head1 NAME	1481	=head1 NAME
1431		1482
1432	pclient - A Crossfire+ and Crossfire game client	1483	cfplus - A Crossfire+ and Crossfire game client
1433		1484
1434	=head1 SYNOPSIS	1485	=head1 SYNOPSIS
1435		1486
1436	Just run it - no commandline arguments are supported.	1487	Just run it - no commandline arguments are supported.
1437		1488
1438	=head1 USAGE	1489	=head1 USAGE
1439		1490
1440	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1491	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441	fullscreen and interactively.	1492	fullscreen and interactively.
1442		1493
1443	=head1 AUTHOR	1494	=head1 AUTHOR
1444		1495
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1496	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.31 by root, Tue May 30 02:22:03 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.31 by root, Tue May 30 02:22:03 2006 UTC