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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.20 by root, Sun May 28 00:40:52 2006 UTC vs.
Revision 1.29 by root, Mon May 29 21:54:16 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
…		…
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);	117	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	118	}
115		119
116	sub start_game {	120	sub start_game {
117	status "logging in...";	121	status "logging in...";
		122
		123	$LOGIN_BUTTON->set_text ("Logout");
		124	$SERVER_SETUP->hide;
118		125
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	126	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		127
121	my ($host, $port) = split /:/, $CFG->{host};	128	my ($host, $port) = split /:/, $CFG->{host};
122		129
…		…
151	};	158	};
152		159
153	if ($CONN) {	160	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	161	CFClient::lowdelay fileno $CONN->{fh};
155		162
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	163	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	164	} else {
163	status "unable to connect";	165	status "unable to connect";
164	stop_game();	166	stop_game();
165	}	167	}
166	}	168	}
167		169
168	sub stop_game {	170	sub stop_game {
		171	$LOGIN_BUTTON->set_text ("Login");
		172	$SERVER_SETUP->show;
		173	$INV_WINDOW->hide;
		174	$LOGVIEW->hide;
		175
169	return unless $CONN;	176	return unless $CONN;
170		177
171	status "connection closed";	178	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	179
173	$CONN->destroy;	180	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	181	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	182	}
179		183
180	sub client_setup {	184	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	185	my $dialog = new CFClient::UI::FancyFrame
182	req_x => 1,	186	req_x => 1,
…		…
433		437
434	&set_gauge_window_fontsize;	438	&set_gauge_window_fontsize;
435		439
436	$win	440	$win
437	}	441	}
		442
438		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	req_y => $HEIGHT * (2/8),
442	req_x => -1,	447	req_x => -1,
…		…
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 => $WIDTH * (1/3),
718	y => $HEIGHT * (1/8),	723	y => $HEIGHT * (1/8),
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 {	727	on_visibility_change => sub {
723	$_[0]->show_centered if $_[1]	728	my ($self, $visible) = @_;
		729	$self->center if $visible;
724	};	730	},
		731	;
725		732
726	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	733	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
727	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	734	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
728		735
729	{	736	{
…		…
860	},	867	},
861	on_activate => sub {	868	on_activate => sub {
862	my ($input, $text) = @_;	869	my ($input, $text) = @_;
863	$input->set_text ('');	870	$input->set_text ('');
864		871
		872	if ($text =~ /^\/bind\s+(.*)$/) {
		873	CFClient::Recorder::open_binding_dialog ([$1]);
865	if ($text =~ /^\/(.*)/) {	874	} elsif ($text =~ /^\/(.*)/) {
866	$::CONN->user_send ($1);	875	$::CONN->user_send ($1);
867	} else {	876	} else {
868	my $say_cmd = $::CFG->{say_command} \|\| 'say';	877	my $say_cmd = $::CFG->{say_command} \|\| 'say';
869	$::CONN->user_send ("$say_cmd $text");	878	$::CONN->user_send ("$say_cmd $text");
870	}	879	}
…		…
886	$window	895	$window
887	}	896	}
888		897
889	sub open_quit_dialog {	898	sub open_quit_dialog {
890	unless ($QUIT_DIALOG) {	899	unless ($QUIT_DIALOG) {
891
892	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	900	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
893		901
894	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	902	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
895		903
896	$vb->add (new CFClient::UI::Label	904	$vb->add (new CFClient::UI::Label
…		…
907	$hb->add (new CFClient::UI::Button	915	$hb->add (new CFClient::UI::Button
908	text => "Quit anyway",	916	text => "Quit anyway",
909	expand => 1,	917	expand => 1,
910	on_activate => sub { exit },	918	on_activate => sub { exit },
911	);	919	);
		920	}
912		921
		922	$QUIT_DIALOG->show;
913	$QUIT_DIALOG->show_centered;	923	$QUIT_DIALOG->center;
914	} else {
915	$QUIT_DIALOG->show_centered;
916	}
917	}	924	}
918		925
919	sub make_inventory_window {	926	sub make_inventory_window {
920	my $invwin = new CFClient::UI::FancyFrame	927	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
921	def_w => $WIDTH * (7/8),	928	def_w => $WIDTH * 7/8,
922	def_h => $HEIGHT * (7/8),	929	def_h => $HEIGHT * 7/8,
923	title => "Inventory",	930	title => "Inventory",
924	name => "inventory_window",	931	name => "inventory_window",
925	on_visibility_change => sub {	932	on_visibility_change => sub {
926	$_[0]->show_centered if $_[1]	933	my ($self, $visible) = @_;
		934	$self->center if $visible;
		935	},
		936	;
		937
		938	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
		939
		940	$hb->add (my $vb1 = new CFClient::UI::VBox);
		941	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
		942	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
		943
		944	$hb->add (my $vb2 = new CFClient::UI::VBox);
		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 = 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::Recorder::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	on_activate => sub {
		973	$binding_list->remove ($hb);
		974	delete $::CFG->{bindings}->{$mod}->{$sym};
		975	});
		976	$hb->add (new CFClient::UI::Label text => "($nam)");
		977	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		978	}
		979	}
		980	};
		981
		982	$BIND_WINDOW = new CFClient::UI::FancyFrame
		983	title => "Bindings",
		984	def_w => int $WIDTH * 7/8,
		985	def_h => int $HEIGHT * 7/8,
		986	on_visibility_change => sub {
		987	my ($self, $visible) = @_;
		988	if ($visible) {
		989	$self->center;
		990	$refresh->()
		991	}
927	};	992	};
928		993
929	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	994	$BIND_WINDOW->add ($binding_list);
930		995	$refresh->();
931	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	996	$BIND_WINDOW
932	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);
933	$lbl->set_text ("Player");
934	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
935
936	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
937
938	$vb2->add (my $hb2 = new CFClient::UI::HBox);
939	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
940	$hb2->add (new CFClient::UI::Button
941	text => "Close",
942	tooltip => "Close the currently open container (if one is open)",
943	on_activate => sub {
944	$CONN->send ("apply $CONN->{open_container}")
945	if $CONN->{open_container} != 0;
946	},
947	);
948
949	$INVR_LBL->set_text ("Floor");
950	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
951
952	$invwin
953	}	997	}
954		998
955	sub make_help_window {	999	sub make_help_window {
956	my $win = new CFClient::UI::FancyFrame	1000	my $win = new CFClient::UI::FancyFrame
957	def_w => int $WIDTH * 7/8,	1001	def_w => int $WIDTH * 7/8,
…		…
1091	$BUTTONBAR->add (new CFClient::UI::Button	1135	$BUTTONBAR->add (new CFClient::UI::Button
1092	text => "Save Config",	1136	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.",	1137	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 {	1138	on_activate => sub {
1095	$::CFG->{layout} = CFClient::UI::get_layout;	1139	$::CFG->{layout} = CFClient::UI::get_layout;
1096	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1140	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097	status "Configuration Saved";	1141	status "Configuration Saved";
1098	},	1142	},
1099	);	1143	);
1100		1144
1101	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1145	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1102	tooltip => "View Documentation");	1146	tooltip => "View Documentation");
		1147
		1148	$BUTTONBAR->add (new CFClient::UI::Flopper
		1149	text => "Bindings",
		1150	other => make_binding_window,
		1151	tooltip => "Lets you delete bindings you have made with the recorder"
		1152	);
		1153	$BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
		1154	tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1103		1155
1104	$BUTTONBAR->add (new CFClient::UI::Button	1156	$BUTTONBAR->add (new CFClient::UI::Button
1105	text => "Quit",	1157	text => "Quit",
1106	tooltip => "Terminates the program",	1158	tooltip => "Terminates the program",
1107	on_activate => sub {	1159	on_activate => sub {
…		…
1115		1167
1116	$BUTTONBAR->show;	1168	$BUTTONBAR->show;
1117		1169
1118	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1170	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1119		1171
1120	# delay till geometry is constant	1172	$SERVER_SETUP->show;
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	}	1173	}
1128	}	1174	}
1129		1175
1130	sub video_shutdown {	1176	sub video_shutdown {
1131	undef $SDL_ACTIVE;	1177	undef $SDL_ACTIVE;
…		…
1341	#############################################################################	1387	#############################################################################
1342		1388
1343	$SIG{INT} = $SIG{TERM} = sub { exit };	1389	$SIG{INT} = $SIG{TERM} = sub { exit };
1344		1390
1345	{	1391	{
1346	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1392	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1347		1393
1348	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1394	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1349	CFClient::UI::set_layout ($::CFG->{layout});	1395	CFClient::UI::set_layout ($::CFG->{layout});
1350		1396
1351	my %DEF_CFG = (	1397	my %DEF_CFG = (
1352	sdl_mode => 0,	1398	sdl_mode => 0,
1353	width => 640,	1399	width => 640,
…		…
1431		1477
1432	END { CFClient::SDL_Quit }	1478	END { CFClient::SDL_Quit }
1433		1479
1434	=head1 NAME	1480	=head1 NAME
1435		1481
1436	pclient - A Crossfire+ and Crossfire game client	1482	cfplus - A Crossfire+ and Crossfire game client
1437		1483
1438	=head1 SYNOPSIS	1484	=head1 SYNOPSIS
1439		1485
1440	Just run it - no commandline arguments are supported.	1486	Just run it - no commandline arguments are supported.
1441		1487
1442	=head1 USAGE	1488	=head1 USAGE
1443		1489
1444	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1490	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1445	fullscreen and interactively.	1491	fullscreen and interactively.
1446		1492
1447	=head1 AUTHOR	1493	=head1 AUTHOR
1448		1494
1449	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1495	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.20 by root, Sun May 28 00:40:52 2006 UTC vs. Revision 1.29 by root, Mon May 29 21:54:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.20 by root, Sun May 28 00:40:52 2006 UTC vs.
Revision 1.29 by root, Mon May 29 21:54:16 2006 UTC