[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.59 by root, Mon Jun 5 22:30:35 2006 UTC

…		…
25	# need to do it again because that pile of garbage called PAR nukes it before main	25	# need to do it again because that pile of garbage called PAR nukes it before main
26	unshift @INC, $ENV{PAR_TEMP}	26	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	27	if %PAR::LibCache;
28		28
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;
31	use Event;	30	use Event;
32		31
33	use Crossfire;	32	use Crossfire;
34	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
35		34
…		…
39	use CFClient::OpenGL ();	38	use CFClient::OpenGL ();
40	use CFClient::Protocol;	39	use CFClient::Protocol;
41	use CFClient::UI;	40	use CFClient::UI;
42	use CFClient::MapWidget;	41	use CFClient::MapWidget;
43		42
		43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
		44
44	$Event::DIED = sub {	45	$Event::DIED = sub {
45	# TODO: display dialog box or so	46	# TODO: display dialog box or so
		47	Carp::confess $_[1];#d#TODO: remove when stable
46	CFClient::error $_[1];	48	CFClient::error $_[1];
47	};	49	};
48		50
49	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#	51	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50		52
…		…
81	our $LOGVIEW;	83	our $LOGVIEW;
82	our $CONSOLE;	84	our $CONSOLE;
83	our $METASERVER;	85	our $METASERVER;
84	our $LOGIN_BUTTON;	86	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	87	our $QUIT_DIALOG;
		88	our $HOST_ENTRY;
		89
		90	our $SETUP_DIALOG;
		91	our $SETUP_NOTEBOOK;
		92	our $SETUP_SERVER;
		93	our $SETUP_KEYBOARD;
		94	our $SETUP_SPELLS;
86		95
87	our $FLOORBOX;	96	our $FLOORBOX;
88	our $GAUGES;	97	our $GAUGES;
89	our $STATWIDS;	98	our $STATWIDS;
90		99
…		…
97		106
98	our $ALT_ENTER_MESSAGE;	107	our $ALT_ENTER_MESSAGE;
99	our $STATUSBOX;	108	our $STATUSBOX;
100	our $DEBUG_STATUS;	109	our $DEBUG_STATUS;
101		110
		111	our $INV_WINDOW;
102	our $INV;	112	our $INV;
103	our $INVR;	113	our $INVR;
104	our $INVR_LBL;	114	our $INV_RIGHT_HB;
		115
		116	our $BIND_EDITOR;
		117
		118	our $PICKUP_CFG;
105		119
106	sub status {	120	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	121	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	122	}
109		123
110	sub debug {	124	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	125	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	126	}
115		127
116	sub start_game {	128	sub start_game {
117	status "logging in...";	129	status "logging in...";
		130
		131	$LOGIN_BUTTON->set_text ("Logout");
		132	$SETUP_DIALOG->hide;
118		133
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	134	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		135
121	my ($host, $port) = split /:/, $CFG->{host};	136	my ($host, $port) = split /:/, $CFG->{host};
122		137
…		…
151	};	166	};
152		167
153	if ($CONN) {	168	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	169	CFClient::lowdelay fileno $CONN->{fh};
155		170
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	171	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	172	} else {
163	status "unable to connect";	173	status "unable to connect";
164	stop_game();	174	stop_game();
165	}	175	}
166	}	176	}
167		177
168	sub stop_game {	178	sub stop_game {
		179	$LOGIN_BUTTON->set_text ("Login");
		180	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
		181	$SETUP_DIALOG->show;
		182	$INV_WINDOW->hide;
		183
169	return unless $CONN;	184	return unless $CONN;
170		185
171	status "connection closed";	186	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	187
173	$CONN->destroy;	188	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	189	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	190	}
179		191
180	sub client_setup {	192	sub graphics_setup {
181	my $dialog = new CFClient::UI::FancyFrame
182	req_x => 1,
183	req_y => $HEIGHT * (1/8),
184	name => "client_setup",
185	title => "Client Setup",
186	child => (my $vbox = new CFClient::UI::VBox);	193	my $vbox = new CFClient::UI::VBox;
		194
187	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	195	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188		196
189	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	197	$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);	198	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191		199
192	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	200	$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");	201	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194		202
195	$mode_slider->connect (changed => sub {	203	$mode_slider->connect (changed => sub {
196	my ($self, $value) = @_;	204	my ($self, $value) = @_;
197		205
…		…
314	on_activate => sub {	322	on_activate => sub {
315	video_shutdown ();	323	video_shutdown ();
316	video_init ();	324	video_init ();
317	}	325	}
318	);	326	);
		327
		328	$vbox
		329	}
		330
		331	sub audio_setup {
		332	my $vbox = new CFClient::UI::VBox;
		333
		334	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		335
		336	my $row = 0;
319		337
320	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	338	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
321	$table->add (1, $row++, new CFClient::UI::CheckBox	339	$table->add (1, $row++, new CFClient::UI::CheckBox
322	state => $CFG->{audio_enable},	340	state => $CFG->{audio_enable},
323	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	341	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
…		…
354	audio_shutdown ();	372	audio_shutdown ();
355	audio_init ();	373	audio_init ();
356	}	374	}
357	);	375	);
358		376
359	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	377	$vbox
360	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
361	text => $CFG->{say_command},
362	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
363	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
364	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
365	on_changed => sub {
366	my ($self, $value) = @_;
367	$CFG->{say_command} = $value;
368	}
369	);
370
371	$dialog
372	}	378	}
373		379
374	sub set_stats_window_fontsize {	380	sub set_stats_window_fontsize {
375	for (values %{$STATWIDS}) {	381	for (values %{$STATWIDS}) {
376	$_->set_fontsize ($::CFG->{stat_fontsize});	382	$_->set_fontsize ($::CFG->{stat_fontsize});
…		…
385		391
386	sub make_gauge_window {	392	sub make_gauge_window {
387	my $gh = int $HEIGHT * $CFG->{gauge_size};	393	my $gh = int $HEIGHT * $CFG->{gauge_size};
388		394
389	my $win = new CFClient::UI::Frame (	395	my $win = new CFClient::UI::Frame (
390	req_y => -1,	396	force_x => 0,
		397	force_y => "max",
391	user_w => $WIDTH,	398	force_w => $WIDTH,
392	user_h => $gh,	399	force_h => $gh,
393	);	400	);
394		401
395	$win->add (my $hbox = new CFClient::UI::HBox	402	$win->add (my $hbox = new CFClient::UI::HBox
396	children => [	403	children => [
397	(new CFClient::UI::HBox expand => 1),	404	(new CFClient::UI::HBox expand => 1),
…		…
433	&set_gauge_window_fontsize;	440	&set_gauge_window_fontsize;
434		441
435	$win	442	$win
436	}	443	}
437		444
		445
438	sub make_stats_window {	446	sub make_stats_window {
439	my $tgw = new CFClient::UI::FancyFrame	447	my $tgw = new CFClient::UI::FancyFrame
440	req_y => $HEIGHT * (2/8),	448	y => $HEIGHT * (2/8),
441	req_x => -1,	449	x => "max",
442	title => "Stats",	450	title => "Stats",
443	name => "stats_window";	451	name => "stats_window";
444		452
445	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	453	$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,	454	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
447	can_hover => 1, can_events => 1,	455	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.");	456	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
547	update_stats_window ({});	555	update_stats_window ({});
548		556
549	$tgw	557	$tgw
550	}	558	}
551		559
552	sub formsep {	560	sub formsep($) {
553	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	561	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
554	}	562	}
555		563
556	sub update_stats_window {	564	sub update_stats_window {
557	my ($stats) = @_;	565	my ($stats) = @_;
558		566
…		…
620		628
621	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	629	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
622	for keys %tbl;	630	for keys %tbl;
623	}	631	}
624		632
625	sub metaserver_dialog {
626	my $dialog = new CFClient::UI::FancyFrame
627	title => "Server List",
628	child => (my $vbox = new CFClient::UI::VBox);
629
630	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
631
632	$dialog
633	}
634
635	my $METASERVER_ATIME;	633	my $METASERVER_ATIME;
636		634
637	sub update_metaserver {	635	sub update_metaserver {
638	my ($HOST) = @_;
639
640	return if $METASERVER_ATIME > time;	636	return if $METASERVER_ATIME > time;
641	$METASERVER_ATIME = time + 60;	637	$METASERVER_ATIME = time + 60;
642		638
643	my $table = $METASERVER->{table};	639	my $table = $METASERVER->{table};
644	$table->clear;	640	$table->clear;
…		…
696		692
697	$y++;	693	$y++;
698		694
699	$table->add (0, $y, new CFClient::UI::VBox children => [	695	$table->add (0, $y, new CFClient::UI::VBox children => [
700	(new CFClient::UI::Button text => "Use", on_activate => sub {	696	(new CFClient::UI::Button text => "Use", on_activate => sub {
701	$HOST->set_text ($CFG->{host} = $host);	697	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		698	$METASERVER->toggle_visibility;
702	}),	699	}),
703	(new CFClient::UI::Empty expand => 1),	700	(new CFClient::UI::Empty expand => 1),
704	]);	701	]);
705		702
706	$table->add ($_ + 1, $y, new CFClient::UI::Label	703	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
709	}	706	}
710	}	707	}
711	});	708	});
712	}	709	}
713		710
		711	sub metaserver_dialog {
		712	my $dialog = new CFClient::UI::FancyFrame
		713	title => "Server List",
		714	name => 'metaserver_dialog',
		715	x => 'center',
		716	y => 'center',
		717	z => 3,
		718	child => (my $vbox = new CFClient::UI::VBox),
		719	on_visibility_change => sub {
		720	update_metaserver if $_[1];
		721	},
		722	;
		723
		724	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		725
		726	$dialog
		727	}
		728
714	sub server_setup {	729	sub server_setup {
715	my $dialog = new CFClient::UI::FancyFrame	730	my $vbox = new CFClient::UI::VBox;
716	x => $WIDTH * (1/3),
717	y => $HEIGHT * (1/8),
718	name => "server_setup",
719	title => "Server Setup",
720	child => (my $vbox = new CFClient::UI::VBox),
721	on_visibility_change => sub {
722	$_[0]->show_centered if $_[1]
723	};
724		731
725	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	732	$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");	733	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
727		734
728	{	735	{
729	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	736	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
730		737
731	$vbox->add (	738	$vbox->add (
732	my $HOST = new CFClient::UI::Entry	739	$HOST_ENTRY = new CFClient::UI::Entry
733	expand => 1,	740	expand => 1,
734	text => $CFG->{host},	741	text => $CFG->{host},
735	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	742	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
736	on_changed => sub {	743	on_changed => sub {
737	my ($self, $value) = @_;	744	my ($self, $value) = @_;
…		…
739	}	746	}
740	);	747	);
741		748
742	$METASERVER = metaserver_dialog;	749	$METASERVER = metaserver_dialog;
743		750
744	$vbox->add (new CFClient::UI::Flopper	751	$vbox->add (new CFClient::UI::Button
745	expand => 1,	752	expand => 1,
746	text => "Server List",	753	text => "Server List",
747	other => $METASERVER,	754	other => $METASERVER,
748	tooltip => "Show a list of available crossfire servers",	755	tooltip => "Show a list of available crossfire servers",
749	on_open => sub {	756	on_activate => sub { $METASERVER->toggle_visibility },
750	update_metaserver $HOST;
751	}
752	);	757	);
753	}	758	}
754		759
755	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	760	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
756	$table->add (1, 4, new CFClient::UI::Entry	761	$table->add (1, 4, new CFClient::UI::Entry
…		…
773	}	778	}
774	);	779	);
775		780
776	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	781	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
777	$table->add (1, 7, new CFClient::UI::Slider	782	$table->add (1, 7, new CFClient::UI::Slider
778	req_w => 100,	783	force_w => 100,
779	range => [$CFG->{mapsize}, 10, 100, 0, 1],	784	range => [$CFG->{mapsize}, 10, 100, 0, 1],
780	tooltip => "This is the size of the portion of the map update the server sends you. "	785	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, "	786	. "If you set this to a high value you will be able to see further, "
782	. "but you also increase bandwidth requirements and latency. "	787	. "but you also increase bandwidth requirements and latency. "
783	. "This option is only used once at log-in.",	788	. "This option is only used once at log-in.",
…		…
823	$CONN ? stop_game	828	$CONN ? stop_game
824	: start_game;	829	: start_game;
825	},	830	},
826	);	831	);
827		832
828	$dialog	833	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
		834	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
		835	text => $CFG->{say_command},
		836	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
		837	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		838	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
		839	on_changed => sub {
		840	my ($self, $value) = @_;
		841	$CFG->{say_command} = $value;
		842	}
		843	);
		844
		845	$vbox
829	}	846	}
830		847
831	sub message_window {	848	sub message_window {
832	my $window = new CFClient::UI::FancyFrame	849	my $window = new CFClient::UI::FancyFrame
833	name => "message_window",	850	name => "message_window",
834	title => "Messages",	851	title => "Messages",
835	border_bg => [1, 1, 1, 1],	852	border_bg => [1, 1, 1, 1],
836	bg => [0, 0, 0, 0.75],	853	bg => [0, 0, 0, 0.75],
837	req_x => -1,	854	x => "max",
		855	y => 0,
838	user_w => int $::WIDTH / 3,	856	force_w => $::WIDTH / 3,
839	user_h => int $::HEIGHT / 5,	857	force_h => $::HEIGHT / 5,
840	child => (my $vbox = new CFClient::UI::VBox);	858	child => (my $vbox = new CFClient::UI::VBox);
841		859
842	$vbox->add ($LOGVIEW);	860	$vbox->add ($LOGVIEW);
843		861
844	$vbox->add (my $input = new CFClient::UI::Entry	862	$vbox->add (my $input = new CFClient::UI::Entry
…		…
876	},	894	},
877	);	895	);
878		896
879	$CONSOLE = {	897	$CONSOLE = {
880	window => $window,	898	window => $window,
881	input => $input	899	input => $input,
882	};	900	};
883		901
884	$window	902	$window
885	}	903	}
886		904
887	sub open_quit_dialog {	905	sub open_quit_dialog {
888	unless ($QUIT_DIALOG) {	906	unless ($QUIT_DIALOG) {
889
890	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	907	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		908	x => "center",
		909	y => "center",
		910	z => 50,
		911	title => "Really Quit?",
		912	;
891		913
892	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	914	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893		915
894	$vb->add (new CFClient::UI::Label	916	$vb->add (new CFClient::UI::Label
895	text => "You should find a savebed and apply it first!",	917	text => "You should find a savebed and apply it first!",
…		…
905	$hb->add (new CFClient::UI::Button	927	$hb->add (new CFClient::UI::Button
906	text => "Quit anyway",	928	text => "Quit anyway",
907	expand => 1,	929	expand => 1,
908	on_activate => sub { exit },	930	on_activate => sub { exit },
909	);	931	);
		932	}
910		933
911	$QUIT_DIALOG->show_centered;	934	$QUIT_DIALOG->show;
912	} else {	935	}
913	$QUIT_DIALOG->show_centered;	936
		937	sub autopickup_setup {
		938	my $table = new CFClient::UI::Table;
		939
		940	for (
		941	["General", 0, 0,
		942	["Enable autopickup" => PICKUP_NEWMODE],
		943	["Inhibit autopickup" => PICKUP_INHIBIT],
		944	["Stop before pickup" => PICKUP_STOP],
		945	["Debug autopickup" => PICKUP_DEBUG],
		946	],
		947	["Weapons", 0, 6,
		948	["All weapons" => PICKUP_ALLWEAPON],
		949	["Missile weapons" => PICKUP_MISSILEWEAPON],
		950	["Bows" => PICKUP_BOW],
		951	["Arrows" => PICKUP_ARROW],
		952	],
		953	["Armour", 0, 12,
		954	["Helmets" => PICKUP_HELMET],
		955	["Shields" => PICKUP_SHIELD],
		956	["Body Armour" => PICKUP_ARMOUR],
		957	["Boots" => PICKUP_BOOTS],
		958	["Gloves" => PICKUP_GLOVES],
		959	["Cloaks" => PICKUP_CLOAK],
		960	],
		961
		962	["Readables", 2, 2,
		963	["Spellbooks" => PICKUP_SPELLBOOK],
		964	["Skillscrolls" => PICKUP_SKILLSCROLL],
		965	["Normal Books/Scrolls" => PICKUP_READABLES],
		966	],
		967	["Misc", 2, 7,
		968	["Food" => PICKUP_FOOD],
		969	["Drinks" => PICKUP_DRINK],
		970	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
		971	["Keys" => PICKUP_KEY],
		972	["Magical Items" => PICKUP_MAGICAL],
		973	["Potions" => PICKUP_POTION],
		974	["Magic Devices" => PICKUP_MAGIC_DEVICE],
		975	["Ignore cursed" => PICKUP_NOT_CURSED],
		976	["Jewelery" => PICKUP_JEWELS],
		977	],
		978	)
914	}	979	{
		980	my ($title, $x, $y, @bits) = @$_;
		981	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
		982
		983	for (@bits) {
		984	++$y;
		985
		986	my $mask = $_->[1];
		987	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
		988	$table->add ($x+1, $y, new CFClient::UI::CheckBox
		989	state => $CFG->{pickup} & $mask,
		990	on_changed => sub {
		991	my ($box, $value) = @_;
		992	if ($value) {
		993	$::CFG->{pickup} \|= $mask;
		994	} else {
		995	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
		996	}
		997	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
		998	if defined $::CONN;
		999	});
		1000	}
		1001	}
		1002
		1003	$table
915	}	1004	}
916		1005
917	sub make_inventory_window {	1006	sub make_inventory_window {
918	my $invwin = new CFClient::UI::FancyFrame	1007	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1008	x => "center",
		1009	y => "center",
919	user_w => $WIDTH * (7/8),	1010	force_w => $WIDTH * 9/10,
920	user_h => $HEIGHT * (7/8),	1011	force_h => $HEIGHT * 9/10,
921	title => "Inventory",	1012	title => "Inventory",
922	name => "inventory_window",	1013	;
923	on_visibility_change => sub {
924	$_[0]->show_centered if $_[1]
925	};
926		1014
927	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	1015	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
928		1016
929	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	1017	$hb->add (my $vb1 = new CFClient::UI::VBox);
930	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	1018	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
931	$lbl->set_text ("Player");
932	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1019	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
933		1020
934	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);	1021	$hb->add (my $vb2 = new CFClient::UI::VBox);
935		1022
		1023	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1024
		1025	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		1026
		1027	# XXX: Call after $INVR = ... because set_opencont sets the items
		1028	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1029
		1030	$invwin
		1031	}
		1032
		1033	sub spell_setup {
		1034	new CFClient::UI::SpellList
		1035	}
		1036
		1037	sub keyboard_setup {
		1038	my $binding_list = new CFClient::UI::VBox;
		1039
		1040	my $refresh;
		1041	$refresh = sub {
		1042	$binding_list->clear ();
		1043
		1044	for my $mod (keys %{$::CFG->{bindings}}) {
		1045	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		1046	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		1047	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		1048
		1049	my $lbl = join "; ", @$cmds;
		1050	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		1051	$binding_list->add (my $hb = new CFClient::UI::HBox);
		1052	$hb->add (new CFClient::UI::Button
		1053	text => "delete",
		1054	tooltip => "Deletes the binding",
		1055	on_activate => sub {
		1056	$binding_list->remove ($hb);
		1057	delete $::CFG->{bindings}->{$mod}->{$sym};
		1058	});
		1059
		1060	$hb->add (new CFClient::UI::Button
		1061	text => "edit",
		1062	tooltip => "Edits the binding",
		1063	on_activate => sub {
		1064	$::BIND_EDITOR->set_binding (
		1065	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		1066	sub {
		1067	my ($nmod, $nsym, $ncmds) = @_;
		1068	delete $::CFG->{bindings}->{$mod}->{$sym};
		1069	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1070	$refresh->();
		1071	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1072	$SETUP_DIALOG->show;
		1073	},
		1074	sub {
		1075	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1076	$SETUP_DIALOG->show;
		1077	});
		1078	$::BIND_EDITOR->show;
		1079	$SETUP_DIALOG->hide;
		1080	});
		1081
		1082	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1083	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1084	}
		1085	}
		1086	};
		1087
		1088	my $vb = new CFClient::UI::VBox;
		1089	$vb->add ($binding_list);
936	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1090	$vb->add (my $hb = new CFClient::UI::HBox);
937	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);	1091
938	$hb2->add (new CFClient::UI::Button	1092	$hb->add (new CFClient::UI::Button
939	text => "Close",	1093	text => "record new",
940	tooltip => "Close the currently open container (if one is open)",	1094	expand => 1,
		1095	tooltip => "This button opens the binding editor with an empty binding.",
941	on_activate => sub {	1096	on_activate => sub {
942	$CONN->send ("apply $CONN->{open_container}")	1097	$::BIND_EDITOR->set_binding (undef, undef, [],
943	if $CONN->{open_container} != 0;	1098	sub {
		1099	my ($mod, $sym, $cmds) = @_;
		1100	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1101	$refresh->();
		1102	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1103	$SETUP_DIALOG->show;
		1104	},
		1105	sub {
		1106	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1107	$SETUP_DIALOG->show;
		1108	},
		1109	);
		1110	$SETUP_DIALOG->hide;
		1111	$::BIND_EDITOR->show;
944	},	1112	},
945	);	1113	);
946		1114
947	$INVR_LBL->set_text ("Floor");	1115	$hb->add (new CFClient::UI::Button
948	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1116	text => "close",
		1117	tooltip => "Closes the binding window",
		1118	expand => 1,
		1119	on_activate => sub {
		1120	$SETUP_DIALOG->hide;
		1121	}
		1122	);
949		1123
950	$invwin	1124	$refresh->();
		1125
		1126	$vb
951	}	1127	}
952		1128
953	sub make_help_window {	1129	sub make_help_window {
954	my $win = new CFClient::UI::FancyFrame	1130	my $win = new CFClient::UI::FancyFrame
955	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	1131	x => 'center',
		1132	y => 'center',
		1133	z => 2,
		1134	name => 'doc_browser',
		1135	force_w => int $WIDTH * 7/8,
		1136	force_h => int $HEIGHT * 7/8,
		1137	title => "Documentation";
956		1138
957	$win->add (my $vbox = new CFClient::UI::VBox);	1139	$win->add (my $vbox = new CFClient::UI::VBox);
958		1140
959	$vbox->add (my $buttons = new CFClient::UI::HBox);	1141	$vbox->add (my $buttons = new CFClient::UI::HBox);
960	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1142	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
968	my ($pod, $label) = @$_;	1150	my ($pod, $label) = @$_;
969		1151
970	$buttons->add (new CFClient::UI::Button	1152	$buttons->add (new CFClient::UI::Button
971	text => $label,	1153	text => $label,
972	on_activate => sub {	1154	on_activate => sub {
973	my $parser = new Pod::POM;	1155	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
974	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");	1156	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
975		1157
976	$viewer->clear;	1158	$viewer->clear;
977		1159
978	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1160	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
979	for @{ CFClient::pod_to_pango_list $pom };	1161	for @$pom;
980		1162
981	$viewer->set_offset (0);	1163	$viewer->set_offset (0);
982	},	1164	},
983	);	1165	);
984	}	1166	}
…		…
1021	if ($DEBUG_STATUS) {	1203	if ($DEBUG_STATUS) {
1022	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1204	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023	} else {	1205	} else {
1024	# create the widgets	1206	# create the widgets
1025		1207
1026	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1208	$DEBUG_STATUS = new CFClient::UI::Label
		1209	padding => 0,
		1210	z => 100,
		1211	force_x => "max",
		1212	force_y => 0;
1027	$DEBUG_STATUS->show;	1213	$DEBUG_STATUS->show;
1028		1214
		1215	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1216
1029	$STATUSBOX = new CFClient::UI::Statusbox;	1217	$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]);	1218	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1031		1219
1032	(new CFClient::UI::Frame	1220	(new CFClient::UI::Frame
1033	bg => [0, 0, 0, 0.4],	1221	bg => [0, 0, 0, 0.4],
1034	req_y => -1,	1222	force_x => 0,
		1223	force_y => "max",
1035	child => $STATUSBOX,	1224	child => $STATUSBOX,
1036	)->show;	1225	)->show;
1037		1226
1038	CFClient::UI::FancyFrame->new (	1227	CFClient::UI::FancyFrame->new (
		1228	title => "Map",
		1229	name => "mapmap",
		1230	x => 0,
		1231	y => $FONTSIZE + 8,
1039	border_bg => [1, 1, 1, 192/255],	1232	border_bg => [1, 1, 1, 192/255],
1040	bg => [1, 1, 1, 0],	1233	bg => [1, 1, 1, 0],
1041	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1234	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.",	1235	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1043	),	1236	),
…		…
1066	can_hover => 1,	1259	can_hover => 1,
1067	can_events => 1,	1260	can_events => 1,
1068	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1261	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1069	;	1262	;
1070		1263
1071	$BUTTONBAR = new CFClient::UI::HBox;	1264	$SETUP_DIALOG = new CFClient::UI::FancyFrame
		1265	title => "Setup",
		1266	name => "setup_dialog",
		1267	x => 'center',
		1268	y => 'center',
		1269	z => 2,
		1270	force_w => $::WIDTH * 0.6,
		1271	force_h => $::HEIGHT * 0.6,
		1272	;
1072		1273
		1274	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
		1275	filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
		1276
		1277	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
		1278	"Configure the server to play on, your username, password and other server-related options.");
		1279	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
		1280	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1281	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
		1282	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
		1283	$SETUP_NOTEBOOK->add (Audio => audio_setup,
		1284	"Configure the use of audio, sound effects and background music.");
		1285	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
		1286	"Lets you define, edit and delete bindings."
		1287	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
		1288	. "with nothing set and the recording started. After doing the actions you "
		1289	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
		1290	. "After pressing the combo the binding will be saved automatically and the "
		1291	. "binding editor closes");
		1292	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
		1293	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1294
		1295	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
		1296
1073	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1297	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1074	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1298	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1075	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1299
1076	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1077	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1300	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1078	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1301	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1079		1302
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	1303	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		1304
1082	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1305	$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.");	1306	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,	1307	$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 :).");	1308	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
		1309	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1086		1310
1087	$BUTTONBAR->add (new CFClient::UI::Button	1311	$BUTTONBAR->add (new CFClient::UI::Button
1088	text => "Save Config",	1312	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.",	1313	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 {	1314	on_activate => sub {
1091	$::CFG->{layout} = CFClient::UI::get_layout;	1315	$::CFG->{layout} = CFClient::UI::get_layout;
1092	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1316	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093	status "Configuration Saved";	1317	status "Configuration Saved";
1094	},	1318	},
1095	);	1319	);
1096		1320
1097	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1321	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
…		…
1108	}	1332	}
1109	},	1333	},
1110	);	1334	);
1111		1335
1112	$BUTTONBAR->show;	1336	$BUTTONBAR->show;
		1337	$SETUP_DIALOG->show;
		1338	}
1113		1339
1114	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1340	$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	}
1124	}	1341	}
1125		1342
1126	sub video_shutdown {	1343	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1344	undef $SDL_ACTIVE;
1128	}	1345	}
…		…
1195		1412
1196	my %demo;#d#	1413	my %demo;#d#
1197		1414
1198	sub force_refresh {	1415	sub force_refresh {
1199	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1416	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1200	debug sprintf "%3.2f", $fps;	1417	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1418
1202	$CFClient::UI::ROOT->draw;	1419	$CFClient::UI::ROOT->draw;
1203		1420
1204	$WANT_REFRESH = 0;	1421	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1422	$CAN_REFRESH = 0;
…		…
1260	};	1477	};
1261		1478
1262	CFClient::SDL_GL_SwapBuffers;	1479	CFClient::SDL_GL_SwapBuffers;
1263	}	1480	}
1264		1481
1265	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	1482	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1266	$NOW = time;	1483	$NOW = time;
1267		1484
1268	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	1485	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1269	for CFClient::SDL_PollEvent;	1486	for CFClient::SDL_PollEvent;
1270		1487
…		…
1337	#############################################################################	1554	#############################################################################
1338		1555
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1556	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1557
1341	{	1558	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1559	local $SIG{__DIE__} = sub {
		1560	return unless defined $^S && !$^S;
		1561	Carp::confess $_[1];#d#TODO: remove when stable
		1562	CFClient::fatal $_[0];
		1563	};
1343		1564
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1565	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1566	CFClient::UI::set_layout ($::CFG->{layout});
1346		1567
1347	my %DEF_CFG = (	1568	my %DEF_CFG = (
1348	sdl_mode => 0,	1569	sdl_mode => 0,
1349	width => 640,	1570	width => 640,
…		…
1427		1648
1428	END { CFClient::SDL_Quit }	1649	END { CFClient::SDL_Quit }
1429		1650
1430	=head1 NAME	1651	=head1 NAME
1431		1652
1432	pclient - A Crossfire+ and Crossfire game client	1653	cfplus - A Crossfire+ and Crossfire game client
1433		1654
1434	=head1 SYNOPSIS	1655	=head1 SYNOPSIS
1435		1656
1436	Just run it - no commandline arguments are supported.	1657	Just run it - no commandline arguments are supported.
1437		1658
1438	=head1 USAGE	1659	=head1 USAGE
1439		1660
1440	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1661	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441	fullscreen and interactively.	1662	fullscreen and interactively.
1442		1663
		1664	=head1 DEBUGGING
		1665
		1666
		1667	CFPLUS_DEBUG - environment variable
		1668
		1669	1 draw borders around widgets
		1670	2 add low-level widget info to tooltips
		1671	4 show fps
		1672	8 suppress tooltips
		1673
1443	=head1 AUTHOR	1674	=head1 AUTHOR
1444		1675
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1676	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446		1677
1447		1678

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.59 by root, Mon Jun 5 22:30:35 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.59 by root, Mon Jun 5 22:30:35 2006 UTC