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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.62 by root, Tue Jun 6 08:35:22 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;
86	our $SERVER_SETUP;	88	our $HOST_ENTRY;
87		89
		90	our $SETUP_DIALOG;
		91	our $SETUP_NOTEBOOK;
		92	our $SETUP_SERVER;
		93	our $SETUP_KEYBOARD;
		94	our $SETUP_SPELLS;
		95
		96	our $STATS_WINDOW;
		97	our $MESSAGE_WINDOW;
88	our $FLOORBOX;	98	our $FLOORBOX;
89	our $GAUGES;	99	our $GAUGES;
90	our $STATWIDS;	100	our $STATWIDS;
91		101
92	our $SDL_ACTIVE;	102	our $SDL_ACTIVE;
…		…
101	our $DEBUG_STATUS;	111	our $DEBUG_STATUS;
102		112
103	our $INV_WINDOW;	113	our $INV_WINDOW;
104	our $INV;	114	our $INV;
105	our $INVR;	115	our $INVR;
106	our $INVR_LBL;	116	our $INV_RIGHT_HB;
		117
		118	our $BIND_EDITOR;
		119
		120	our $PICKUP_CFG;
107		121
108	sub status {	122	sub status {
109	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	123	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
110	}	124	}
111		125
112	sub debug {	126	sub debug {
113	$DEBUG_STATUS->set_text ($_[0]);	127	$DEBUG_STATUS->set_text ($_[0]);
114	my ($w, $h) = $DEBUG_STATUS->size_request;	128	}
115	$DEBUG_STATUS->move ($WIDTH - $w, 0);	129
		130	sub destroy_query_dialog {
		131	(delete $_[0]{query_dialog})->destroy
		132	if $_[0]{query_dialog};
		133	}
		134
		135	# server query dialog
		136	sub server_query {
		137	my ($conn, $flags, $prompt) = @_;
		138
		139	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
		140	x => "center",
		141	y => "center",
		142	title => "Server Query",
		143	child => my $vbox = new CFClient::UI::VBox,
		144	;
		145
		146	my @dialog = my $label = new CFClient::UI::Label
		147	max_w => $::WIDTH * 0.4,
		148	ellipsise => 0,
		149	text => $prompt;
		150
		151	if ($flags & CS_QUERY_YESNO) {
		152	push @dialog, my $hbox = new CFClient::UI::HBox;
		153
		154	$hbox->add (new CFClient::UI::Button
		155	text => "No",
		156	on_activate => sub {
		157	$conn->send ("reply n");
		158	$dialog->destroy;
		159	}
		160	);
		161	$hbox->add (new CFClient::UI::Button
		162	text => "Yes",
		163	on_activate => sub {
		164	$conn->send ("reply y");
		165	destroy_query_dialog $conn;
		166	},
		167	);
		168
		169	$dialog->focus_in;
		170
		171	} elsif ($flags & CS_QUERY_SINGLECHAR) {
		172	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		173
		174	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
		175	$MESSAGE_WINDOW->show;
		176
		177	unshift @dialog, new CFClient::UI::Label
		178	max_w => $::WIDTH * 0.4,
		179	ellipsise => 0,
		180	markup => "\nOr use your keyboard:\n";
		181
		182	unshift @dialog, my $table = new CFClient::UI::Table;
		183
		184	$table->add (0, 0, new CFClient::UI::Button
		185	text => "Next Race",
		186	on_activate => sub {
		187	$conn->send ("reply n");
		188	destroy_query_dialog $conn;
		189	},
		190	);
		191	$table->add (2, 0, new CFClient::UI::Button
		192	text => "Accept",
		193	on_activate => sub {
		194	$conn->send ("reply d");
		195	destroy_query_dialog $conn;
		196	},
		197	);
		198
		199	unshift @dialog, new CFClient::UI::Label
		200	max_w => $::WIDTH * 0.4,
		201	ellipsise => 0,
		202	markup =>
		203	"<big><b>Character Creation: Race</b></big>\n\n"
		204	. "Look at the <b>Messages</b> window to see a description of this race "
		205	. "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
		206	. "and the center of the screen to see how this race looks like "
		207	. "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
		208	. "You can look at another race, or accept this race (you will come back to this race eventually, "
		209	. "so you can take your time making this important choice."
		210	;
		211
		212	} elsif ($prompt =~ /roll new stats/) {
		213	if (my $stat = delete $conn->{stat_change_with}) {
		214	$conn->send ("reply $stat");
		215	destroy_query_dialog $conn;
		216	return;
		217	}
		218
		219	$STATS_WINDOW->show;
		220	$MESSAGE_WINDOW->hide;
		221
		222	unshift @dialog, new CFClient::UI::Label
		223	max_w => $::WIDTH * 0.4,
		224	ellipsise => 0,
		225	markup => "\nOr use your keyboard:\n";
		226
		227	unshift @dialog, my $table = new CFClient::UI::Table;
		228
		229	# left: re-roll
		230	$table->add (0, 0, new CFClient::UI::Button
		231	text => "Roll Again",
		232	on_activate => sub {
		233	$conn->send ("reply y");
		234	destroy_query_dialog $conn;
		235	},
		236	);
		237
		238	# center: swap stats
		239	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
		240	value => $_,
		241	options => [
		242	[Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
		243	[Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		244	[Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		245	[Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		246	[Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		247	[Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
		248	[Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
		249	],
		250	), 1 .. 2;
		251
		252	$table->add (2, 0, new CFClient::UI::Button
		253	text => "Swap Stats",
		254	on_activate => sub {
		255	$conn->{stat_change_with} = $sw2->{value};
		256	$conn->send ("reply $sw1->{value}");
		257	destroy_query_dialog $conn;
		258	},
		259	);
		260	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
		261
		262	# right: accept
		263	$table->add (4, 0, new CFClient::UI::Button
		264	text => "Accept",
		265	on_activate => sub {
		266	$conn->send ("reply n");
		267	$STATS_WINDOW->hide;
		268	destroy_query_dialog $conn;
		269	},
		270	);
		271
		272	unshift @dialog, new CFClient::UI::Label
		273	max_w => $::WIDTH * 0.4,
		274	ellipsise => 0,
		275	markup =>
		276	"<big><b>Character Creation: Stats</b></big>\n\n"
		277	. "Look at the <b>Stats</b> window to see your basic stats "
		278	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
		279	. "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
		280	. "Race selection will influence those values later on."
		281	;
		282	}
		283
		284	push @dialog, my $entry = new CFClient::UI::Entry
		285	on_changed => sub {
		286	$conn->send ("reply $_[1]");
		287	destroy_query_dialog $conn;
		288	},
		289	;
		290
		291	$entry->focus_in;
		292
		293	} else {
		294	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		295
		296	push @dialog, my $entry = new CFClient::UI::Entry
		297	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
		298	on_activate => sub {
		299	$conn->send ("reply $_[1]");
		300	destroy_query_dialog $conn;
		301	},
		302	;
		303
		304	$entry->focus_in;
		305	}
		306
		307	$vbox->add (@dialog);
		308	$dialog->show;
116	}	309	}
117		310
118	sub start_game {	311	sub start_game {
119	status "logging in...";	312	status "logging in...";
120		313
121	$LOGIN_BUTTON->set_text ("Logout");	314	$LOGIN_BUTTON->set_text ("Logout");
122	$SERVER_SETUP->hide;	315	$SETUP_DIALOG->hide;
123		316
124	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	317	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
125		318
126	my ($host, $port) = split /:/, $CFG->{host};	319	my ($host, $port) = split /:/, $CFG->{host};
127		320
…		…
139	map_widget => $MAPWIDGET,	332	map_widget => $MAPWIDGET,
140	logview => $LOGVIEW,	333	logview => $LOGVIEW,
141	statusbox => $STATUSBOX,	334	statusbox => $STATUSBOX,
142	map => $MAP,	335	map => $MAP,
143	mapmap => $MAPMAP,	336	mapmap => $MAPMAP,
		337	query => \&server_query,
144		338
145	sound_play => sub {	339	sound_play => sub {
146	my ($x, $y, $soundnum, $type) = @_;	340	my ($x, $y, $soundnum, $type) = @_;
147		341
148	$SDL_MIXER	342	$SDL_MIXER
…		…
165	}	359	}
166	}	360	}
167		361
168	sub stop_game {	362	sub stop_game {
169	$LOGIN_BUTTON->set_text ("Login");	363	$LOGIN_BUTTON->set_text ("Login");
170	$SERVER_SETUP->show;	364	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
		365	$SETUP_DIALOG->show;
171	$INV_WINDOW->hide;	366	$INV_WINDOW->hide;
172	$LOGVIEW->hide;
173		367
174	return unless $CONN;	368	return unless $CONN;
175		369
176	status "connection closed";	370	status "connection closed";
177		371
		372	destroy_query_dialog $CONN;
178	$CONN->destroy;	373	$CONN->destroy;
179	$CONN = 0; # false, does not autovivify	374	$CONN = 0; # false, does not autovivify
180	}	375	}
181		376
182	sub client_setup {	377	sub graphics_setup {
183	my $dialog = new CFClient::UI::FancyFrame
184	req_x => 1,
185	req_y => $HEIGHT * (1/8),
186	name => "client_setup",
187	title => "Client Setup",
188	child => (my $vbox = new CFClient::UI::VBox);	378	my $vbox = new CFClient::UI::VBox;
		379
189	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	380	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
190		381
191	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	382	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
192	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	383	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193		384
194	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	385	$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]);
195	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	386	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
196		387
197	$mode_slider->connect (changed => sub {	388	$mode_slider->connect (changed => sub {
198	my ($self, $value) = @_;	389	my ($self, $value) = @_;
199		390
…		…
316	on_activate => sub {	507	on_activate => sub {
317	video_shutdown ();	508	video_shutdown ();
318	video_init ();	509	video_init ();
319	}	510	}
320	);	511	);
		512
		513	$vbox
		514	}
		515
		516	sub audio_setup {
		517	my $vbox = new CFClient::UI::VBox;
		518
		519	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		520
		521	my $row = 0;
321		522
322	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	523	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
323	$table->add (1, $row++, new CFClient::UI::CheckBox	524	$table->add (1, $row++, new CFClient::UI::CheckBox
324	state => $CFG->{audio_enable},	525	state => $CFG->{audio_enable},
325	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.",	526	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.",
…		…
356	audio_shutdown ();	557	audio_shutdown ();
357	audio_init ();	558	audio_init ();
358	}	559	}
359	);	560	);
360		561
361	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	562	$vbox
362	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
363	text => $CFG->{say_command},
364	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. "
365	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
366	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
367	on_changed => sub {
368	my ($self, $value) = @_;
369	$CFG->{say_command} = $value;
370	}
371	);
372
373	$dialog
374	}	563	}
375		564
376	sub set_stats_window_fontsize {	565	sub set_stats_window_fontsize {
377	for (values %{$STATWIDS}) {	566	for (values %{$STATWIDS}) {
378	$_->set_fontsize ($::CFG->{stat_fontsize});	567	$_->set_fontsize ($::CFG->{stat_fontsize});
…		…
387		576
388	sub make_gauge_window {	577	sub make_gauge_window {
389	my $gh = int $HEIGHT * $CFG->{gauge_size};	578	my $gh = int $HEIGHT * $CFG->{gauge_size};
390		579
391	my $win = new CFClient::UI::Frame (	580	my $win = new CFClient::UI::Frame (
392	req_x => 0,	581	force_x => 0,
393	req_y => -1,	582	force_y => "max",
394	def_w => $WIDTH,	583	force_w => $WIDTH,
395	def_h => $gh,	584	force_h => $gh,
396	);	585	);
397		586
398	$win->add (my $hbox = new CFClient::UI::HBox	587	$win->add (my $hbox = new CFClient::UI::HBox
399	children => [	588	children => [
400	(new CFClient::UI::HBox expand => 1),	589	(new CFClient::UI::HBox expand => 1),
…		…
436	&set_gauge_window_fontsize;	625	&set_gauge_window_fontsize;
437		626
438	$win	627	$win
439	}	628	}
440		629
		630
441	sub make_stats_window {	631	sub stats_window {
442	my $tgw = new CFClient::UI::FancyFrame	632	my $tgw = new CFClient::UI::FancyFrame
443	req_y => $HEIGHT * (2/8),	633	y => $HEIGHT * (2/8),
444	req_x => -1,	634	x => "max",
445	title => "Stats",	635	title => "Stats",
446	name => "stats_window";	636	name => "stats_window";
447		637
448	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	638	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
449	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	639	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
450	can_hover => 1, can_events => 1,	640	can_hover => 1, can_events => 1,
451	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	641	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
550	update_stats_window ({});	740	update_stats_window ({});
551		741
552	$tgw	742	$tgw
553	}	743	}
554		744
555	sub formsep {	745	sub formsep($) {
556	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	746	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
557	}	747	}
558		748
559	sub update_stats_window {	749	sub update_stats_window {
560	my ($stats) = @_;	750	my ($stats) = @_;
561		751
…		…
623		813
624	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	814	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
625	for keys %tbl;	815	for keys %tbl;
626	}	816	}
627		817
628	sub metaserver_dialog {
629	my $dialog = new CFClient::UI::FancyFrame
630	title => "Server List",
631	child => (my $vbox = new CFClient::UI::VBox);
632
633	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
634
635	$dialog
636	}
637
638	my $METASERVER_ATIME;	818	my $METASERVER_ATIME;
639		819
640	sub update_metaserver {	820	sub update_metaserver {
641	my ($HOST) = @_;
642
643	return if $METASERVER_ATIME > time;	821	return if $METASERVER_ATIME > time;
644	$METASERVER_ATIME = time + 60;	822	$METASERVER_ATIME = time + 60;
645		823
646	my $table = $METASERVER->{table};	824	my $table = $METASERVER->{table};
647	$table->clear;	825	$table->clear;
…		…
668		846
669	utf8::decode $buf if utf8::valid $buf;	847	utf8::decode $buf if utf8::valid $buf;
670		848
671	$table->clear;	849	$table->clear;
672		850
		851	my @tip = (
		852	"The current number of users logged in on the server.",
		853	"The hostname of the server.",
		854	"The time this server has been running without being restarted.",
		855	"The server software version - a '+' indicates a Crossfire+ server.",
		856	"Short information about this server provided by its admins.",
		857	);
673	my @col = qw(Use #Users Host Uptime Version Description);	858	my @col = qw(#Users Host Uptime Version Description);
674	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	859	$table->add ($_, 0, new CFClient::UI::Label
		860	can_hover => 1, can_events => 1,
		861	align => 0, fg => [1, 1, 0],
		862	text => $col[$_], tooltip => $tip[$_])
675	for 0 .. $#col;	863	for 0 .. $#col;
676		864
677	my @align = qw(1 0 1 1 -1);	865	my @align = qw(1 0 1 1 -1);
678		866
679	my $y = 0;	867	my $y = 0;
680	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	868	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
…		…
697		885
698	$m = [$users, $host, $uptime, $version, $desc];	886	$m = [$users, $host, $uptime, $version, $desc];
699		887
700	$y++;	888	$y++;
701		889
702	$table->add (0, $y, new CFClient::UI::VBox children => [	890	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
703	(new CFClient::UI::Button text => "Use", on_activate => sub {	891	(new CFClient::UI::Button
		892	text => "Use",
		893	tooltip => "Put this server into the <b>Host:Port</b> field",
		894	on_activate => sub {
704	$HOST->set_text ($CFG->{host} = $host);	895	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		896	$METASERVER->hide;
		897	},
705	}),	898	),
706	(new CFClient::UI::Empty expand => 1),	899	(new CFClient::UI::Empty expand => 1),
707	]);	900	]);
708		901
709	$table->add ($_ + 1, $y, new CFClient::UI::Label	902	$table->add ($_, $y, new CFClient::UI::Label
710	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	903	ellipsise => 0,
		904	align => $align[$_],
		905	text => $m->[$_],
		906	tooltip => $tip[$_],
		907	can_hover => 1,
		908	can_events => 1,
		909	fontsize => 0.8)
711	for 0 .. $#$m;	910	for 0 .. $#$m;
712	}	911	}
713	}	912	}
714	});	913	});
715	}	914	}
716		915
717	sub server_setup {	916	sub metaserver_dialog {
718	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame	917	my $dialog = new CFClient::UI::FancyFrame
719	x => $WIDTH * (1/3),	918	title => "Server List",
720	y => $HEIGHT * (1/8),	919	name => 'metaserver_dialog',
721	name => "server_setup",	920	x => 'center',
722	title => "Server Setup",	921	y => 'center',
		922	z => 3,
		923	force_h => $::HEIGHT * 0.4,
723	child => (my $vbox = new CFClient::UI::VBox),	924	child => (my $vbox = new CFClient::UI::VBox),
724	on_visibility_change => sub {	925	on_visibility_change => sub {
725	my ($self, $visible) = @_;	926	update_metaserver if $_[1];
726	$self->center if $visible;
727	},	927	},
728	;	928	;
729		929
		930	$dialog->{table} = new CFClient::UI::Table;
		931
		932	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
		933
		934	$dialog
		935	}
		936
		937	sub server_setup {
		938	my $vbox = new CFClient::UI::VBox;
		939
730	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	940	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
731	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	941	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
732		942
733	{	943	{
734	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	944	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735		945
736	$vbox->add (	946	$vbox->add (
737	my $HOST = new CFClient::UI::Entry	947	$HOST_ENTRY = new CFClient::UI::Entry
738	expand => 1,	948	expand => 1,
739	text => $CFG->{host},	949	text => $CFG->{host},
740	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	950	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741	on_changed => sub {	951	on_changed => sub {
742	my ($self, $value) = @_;	952	my ($self, $value) = @_;
…		…
744	}	954	}
745	);	955	);
746		956
747	$METASERVER = metaserver_dialog;	957	$METASERVER = metaserver_dialog;
748		958
749	$vbox->add (new CFClient::UI::Flopper	959	$vbox->add (new CFClient::UI::Button
750	expand => 1,	960	expand => 1,
751	text => "Server List",	961	text => "Server List",
752	other => $METASERVER,	962	other => $METASERVER,
753	tooltip => "Show a list of available crossfire servers",	963	tooltip => "Show a list of available crossfire servers",
754	on_open => sub {	964	on_activate => sub { $METASERVER->toggle_visibility },
755	update_metaserver $HOST;	965	on_visibility_change => sub { $METASERVER->hide unless $_[1] },
756	}
757	);	966	);
758	}	967	}
759		968
760	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	969	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
761	$table->add (1, 4, new CFClient::UI::Entry	970	$table->add (1, 4, new CFClient::UI::Entry
…		…
778	}	987	}
779	);	988	);
780		989
781	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	990	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
782	$table->add (1, 7, new CFClient::UI::Slider	991	$table->add (1, 7, new CFClient::UI::Slider
783	req_w => 100,	992	force_w => 100,
784	range => [$CFG->{mapsize}, 10, 100, 0, 1],	993	range => [$CFG->{mapsize}, 10, 100, 0, 1],
785	tooltip => "This is the size of the portion of the map update the server sends you. "	994	tooltip => "This is the size of the portion of the map update the server sends you. "
786	. "If you set this to a high value you will be able to see further, "	995	. "If you set this to a high value you will be able to see further, "
787	. "but you also increase bandwidth requirements and latency. "	996	. "but you also increase bandwidth requirements and latency. "
788	. "This option is only used once at log-in.",	997	. "This option is only used once at log-in.",
…		…
828	$CONN ? stop_game	1037	$CONN ? stop_game
829	: start_game;	1038	: start_game;
830	},	1039	},
831	);	1040	);
832		1041
833	$dialog	1042	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
		1043	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
		1044	text => $CFG->{say_command},
		1045	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. "
		1046	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		1047	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
		1048	on_changed => sub {
		1049	my ($self, $value) = @_;
		1050	$CFG->{say_command} = $value;
		1051	}
		1052	);
		1053
		1054	$vbox
834	}	1055	}
835		1056
836	sub message_window {	1057	sub message_window {
837	my $window = new CFClient::UI::FancyFrame	1058	my $window = new CFClient::UI::FancyFrame
838	name => "message_window",	1059	name => "message_window",
839	title => "Messages",	1060	title => "Messages",
840	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
841	bg => [0, 0, 0, 0.75],	1062	bg => [0, 0, 0, 0.75],
842	req_x => -1,	1063	x => "max",
843	req_y => 0,	1064	y => 0,
844	def_w => int $::WIDTH / 3,	1065	force_w => $::WIDTH * 0.4,
845	def_h => int $::HEIGHT / 5,	1066	force_h => $::HEIGHT * 0.5,
846	child => (my $vbox = new CFClient::UI::VBox);	1067	child => (my $vbox = new CFClient::UI::VBox);
847		1068
848	$vbox->add ($LOGVIEW);	1069	$vbox->add ($LOGVIEW);
849		1070
850	$vbox->add (my $input = new CFClient::UI::Entry	1071	$vbox->add (my $input = new CFClient::UI::Entry
…		…
882	},	1103	},
883	);	1104	);
884		1105
885	$CONSOLE = {	1106	$CONSOLE = {
886	window => $window,	1107	window => $window,
887	input => $input	1108	input => $input,
888	};	1109	};
889		1110
890	$window	1111	$window
891	}	1112	}
892		1113
893	sub open_quit_dialog {	1114	sub open_quit_dialog {
894	unless ($QUIT_DIALOG) {	1115	unless ($QUIT_DIALOG) {
895	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	1116	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		1117	x => "center",
		1118	y => "center",
		1119	z => 50,
		1120	title => "Really Quit?",
		1121	;
896		1122
897	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1123	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898		1124
899	$vb->add (new CFClient::UI::Label	1125	$vb->add (new CFClient::UI::Label
900	text => "You should find a savebed and apply it first!",	1126	text => "You should find a savebed and apply it first!",
…		…
913	on_activate => sub { exit },	1139	on_activate => sub { exit },
914	);	1140	);
915	}	1141	}
916		1142
917	$QUIT_DIALOG->show;	1143	$QUIT_DIALOG->show;
918	$QUIT_DIALOG->center;
919	}	1144	}
920		1145
		1146	sub autopickup_setup {
		1147	my $table = new CFClient::UI::Table;
		1148
		1149	for (
		1150	["General", 0, 0,
		1151	["Enable autopickup" => PICKUP_NEWMODE],
		1152	["Inhibit autopickup" => PICKUP_INHIBIT],
		1153	["Stop before pickup" => PICKUP_STOP],
		1154	["Debug autopickup" => PICKUP_DEBUG],
		1155	],
		1156	["Weapons", 0, 6,
		1157	["All weapons" => PICKUP_ALLWEAPON],
		1158	["Missile weapons" => PICKUP_MISSILEWEAPON],
		1159	["Bows" => PICKUP_BOW],
		1160	["Arrows" => PICKUP_ARROW],
		1161	],
		1162	["Armour", 0, 12,
		1163	["Helmets" => PICKUP_HELMET],
		1164	["Shields" => PICKUP_SHIELD],
		1165	["Body Armour" => PICKUP_ARMOUR],
		1166	["Boots" => PICKUP_BOOTS],
		1167	["Gloves" => PICKUP_GLOVES],
		1168	["Cloaks" => PICKUP_CLOAK],
		1169	],
		1170
		1171	["Readables", 2, 2,
		1172	["Spellbooks" => PICKUP_SPELLBOOK],
		1173	["Skillscrolls" => PICKUP_SKILLSCROLL],
		1174	["Normal Books/Scrolls" => PICKUP_READABLES],
		1175	],
		1176	["Misc", 2, 7,
		1177	["Food" => PICKUP_FOOD],
		1178	["Drinks" => PICKUP_DRINK],
		1179	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
		1180	["Keys" => PICKUP_KEY],
		1181	["Magical Items" => PICKUP_MAGICAL],
		1182	["Potions" => PICKUP_POTION],
		1183	["Magic Devices" => PICKUP_MAGIC_DEVICE],
		1184	["Ignore cursed" => PICKUP_NOT_CURSED],
		1185	["Jewelery" => PICKUP_JEWELS],
		1186	],
		1187	)
		1188	{
		1189	my ($title, $x, $y, @bits) = @$_;
		1190	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
		1191
		1192	for (@bits) {
		1193	++$y;
		1194
		1195	my $mask = $_->[1];
		1196	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
		1197	$table->add ($x+1, $y, new CFClient::UI::CheckBox
		1198	state => $CFG->{pickup} & $mask,
		1199	on_changed => sub {
		1200	my ($box, $value) = @_;
		1201	if ($value) {
		1202	$::CFG->{pickup} \|= $mask;
		1203	} else {
		1204	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
		1205	}
		1206	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
		1207	if defined $::CONN;
		1208	});
		1209	}
		1210	}
		1211
		1212	$table
		1213	}
		1214
921	sub make_inventory_window {	1215	sub inventory_window {
922	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1216	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1217	x => "center",
		1218	y => "center",
923	def_w => $WIDTH * 7/8,	1219	force_w => $WIDTH * 9/10,
924	def_h => $HEIGHT * 7/8,	1220	force_h => $HEIGHT * 9/10,
925	title => "Inventory",	1221	title => "Inventory",
926	name => "inventory_window",
927	on_visibility_change => sub {
928	my ($self, $visible) = @_;
929	$self->center if $visible;
930	},
931	;	1222	;
932		1223
933	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1224	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934		1225
935	$hb->add (my $vb1 = new CFClient::UI::VBox);	1226	$hb->add (my $vb1 = new CFClient::UI::VBox);
936	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1227	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1228	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938		1229
939	$hb->add (my $vb2 = new CFClient::UI::VBox);	1230	$hb->add (my $vb2 = new CFClient::UI::VBox);
940		1231
		1232	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1233
		1234	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		1235
		1236	# XXX: Call after $INVR = ... because set_opencont sets the items
		1237	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1238
		1239	$invwin
		1240	}
		1241
		1242	sub spell_setup {
		1243	new CFClient::UI::SpellList
		1244	}
		1245
		1246	sub keyboard_setup {
		1247	my $binding_list = new CFClient::UI::VBox;
		1248
		1249	my $refresh;
		1250	$refresh = sub {
		1251	$binding_list->clear ();
		1252
		1253	for my $mod (keys %{$::CFG->{bindings}}) {
		1254	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		1255	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		1256	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		1257
		1258	my $lbl = join "; ", @$cmds;
		1259	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		1260	$binding_list->add (my $hb = new CFClient::UI::HBox);
		1261	$hb->add (new CFClient::UI::Button
		1262	text => "delete",
		1263	tooltip => "Deletes the binding",
		1264	on_activate => sub {
		1265	$binding_list->remove ($hb);
		1266	delete $::CFG->{bindings}->{$mod}->{$sym};
		1267	});
		1268
		1269	$hb->add (new CFClient::UI::Button
		1270	text => "edit",
		1271	tooltip => "Edits the binding",
		1272	on_activate => sub {
		1273	$::BIND_EDITOR->set_binding (
		1274	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		1275	sub {
		1276	my ($nmod, $nsym, $ncmds) = @_;
		1277	delete $::CFG->{bindings}->{$mod}->{$sym};
		1278	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1279	$refresh->();
		1280	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1281	$SETUP_DIALOG->show;
		1282	},
		1283	sub {
		1284	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1285	$SETUP_DIALOG->show;
		1286	});
		1287	$::BIND_EDITOR->show;
		1288	$SETUP_DIALOG->hide;
		1289	});
		1290
		1291	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1292	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1293	}
		1294	}
		1295	};
		1296
		1297	my $vb = new CFClient::UI::VBox;
		1298	$vb->add ($binding_list);
941	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1299	$vb->add (my $hb = new CFClient::UI::HBox);
942	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");	1300
943	$hb2->add (new CFClient::UI::Button	1301	$hb->add (new CFClient::UI::Button
944	text => "Close",	1302	text => "record new",
945	tooltip => "Close the currently open container (if one is open)",	1303	expand => 1,
		1304	tooltip => "This button opens the binding editor with an empty binding.",
946	on_activate => sub {	1305	on_activate => sub {
947	$CONN->send ("apply $CONN->{open_container}")	1306	$::BIND_EDITOR->set_binding (undef, undef, [],
948	if $CONN->{open_container} != 0;	1307	sub {
		1308	my ($mod, $sym, $cmds) = @_;
		1309	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1310	$refresh->();
		1311	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1312	$SETUP_DIALOG->show;
		1313	},
		1314	sub {
		1315	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1316	$SETUP_DIALOG->show;
		1317	},
		1318	);
		1319	$SETUP_DIALOG->hide;
		1320	$::BIND_EDITOR->show;
949	},	1321	},
950	);	1322	);
951		1323
952	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1324	$hb->add (new CFClient::UI::Button
		1325	text => "close",
		1326	tooltip => "Closes the binding window",
		1327	expand => 1,
		1328	on_activate => sub {
		1329	$SETUP_DIALOG->hide;
		1330	}
		1331	);
953		1332
954	$invwin	1333	$refresh->();
		1334
		1335	$vb
955	}	1336	}
956		1337
957	sub make_help_window {	1338	sub make_help_window {
958	my $win = new CFClient::UI::FancyFrame	1339	my $win = new CFClient::UI::FancyFrame
		1340	x => 'center',
		1341	y => 'center',
		1342	z => 2,
		1343	name => 'doc_browser',
959	def_w => int $WIDTH * 7/8,	1344	force_w => int $WIDTH * 7/8,
960	def_h => int $HEIGHT * 7/8,	1345	force_h => int $HEIGHT * 7/8,
961	title => "Documentation";	1346	title => "Documentation";
962		1347
963	$win->add (my $vbox = new CFClient::UI::VBox);	1348	$win->add (my $vbox = new CFClient::UI::VBox);
964		1349
965	$vbox->add (my $buttons = new CFClient::UI::HBox);	1350	$vbox->add (my $buttons = new CFClient::UI::HBox);
966	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1351	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
974	my ($pod, $label) = @$_;	1359	my ($pod, $label) = @$_;
975		1360
976	$buttons->add (new CFClient::UI::Button	1361	$buttons->add (new CFClient::UI::Button
977	text => $label,	1362	text => $label,
978	on_activate => sub {	1363	on_activate => sub {
979	my $parser = new Pod::POM;	1364	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
980	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");	1365	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
981		1366
982	$viewer->clear;	1367	$viewer->clear;
983		1368
984	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1369	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
985	for @{ CFClient::pod_to_pango_list $pom };	1370	for @$pom;
986		1371
987	$viewer->set_offset (0);	1372	$viewer->set_offset (0);
988	},	1373	},
989	);	1374	);
990	}	1375	}
…		…
1027	if ($DEBUG_STATUS) {	1412	if ($DEBUG_STATUS) {
1028	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1413	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029	} else {	1414	} else {
1030	# create the widgets	1415	# create the widgets
1031		1416
1032	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1417	$DEBUG_STATUS = new CFClient::UI::Label
		1418	padding => 0,
		1419	z => 100,
		1420	force_x => "max",
		1421	force_y => 0;
1033	$DEBUG_STATUS->show;	1422	$DEBUG_STATUS->show;
1034		1423
		1424	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1425
1035	$STATUSBOX = new CFClient::UI::Statusbox;	1426	$STATUSBOX = new CFClient::UI::Statusbox;
1036	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1427	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1037		1428
1038	(new CFClient::UI::Frame	1429	(new CFClient::UI::Frame
1039	bg => [0, 0, 0, 0.4],	1430	bg => [0, 0, 0, 0.4],
1040	req_y => -1,	1431	force_x => 0,
		1432	force_y => "max",
1041	child => $STATUSBOX,	1433	child => $STATUSBOX,
1042	)->show;	1434	)->show;
1043		1435
1044	CFClient::UI::FancyFrame->new (	1436	CFClient::UI::FancyFrame->new (
		1437	title => "Map",
		1438	name => "mapmap",
		1439	x => 0,
		1440	y => $FONTSIZE + 8,
1045	border_bg => [1, 1, 1, 192/255],	1441	border_bg => [1, 1, 1, 192/255],
1046	bg => [1, 1, 1, 0],	1442	bg => [1, 1, 1, 0],
1047	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1443	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1048	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1444	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049	),	1445	),
…		…
1067		1463
1068	$LOGVIEW = new CFClient::UI::TextView	1464	$LOGVIEW = new CFClient::UI::TextView
1069	expand => 1,	1465	expand => 1,
1070	font => $FONT_FIXED,	1466	font => $FONT_FIXED,
1071	fontsize => $::CFG->{log_fontsize},	1467	fontsize => $::CFG->{log_fontsize},
		1468	indent => -4,
1072	can_hover => 1,	1469	can_hover => 1,
1073	can_events => 1,	1470	can_events => 1,
1074	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1471	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1075	;	1472	;
1076		1473
1077	$BUTTONBAR = new CFClient::UI::HBox;	1474	$SETUP_DIALOG = new CFClient::UI::FancyFrame
		1475	title => "Setup",
		1476	name => "setup_dialog",
		1477	x => 'center',
		1478	y => 'center',
		1479	z => 2,
		1480	force_w => $::WIDTH * 0.6,
		1481	force_h => $::HEIGHT * 0.6,
		1482	;
1078		1483
		1484	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
		1485	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1486
		1487	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
		1488	"Configure the server to play on, your username, password and other server-related options.");
		1489	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
		1490	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1491	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
		1492	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
		1493	$SETUP_NOTEBOOK->add (Audio => audio_setup,
		1494	"Configure the use of audio, sound effects and background music.");
		1495	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
		1496	"Lets you define, edit and delete bindings."
		1497	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
		1498	. "with nothing set and the recording started. After doing the actions you "
		1499	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
		1500	. "After pressing the combo the binding will be saved automatically and the "
		1501	. "binding editor closes");
		1502	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
		1503	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1504
		1505	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
		1506
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1507	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1080	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1508	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1081	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1509
1082	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1083	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1510	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1084	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1511	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1085		1512
1086	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	1513	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
1087		1514
1088	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1515	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1089	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1516	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1090	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1517	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1091	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1518	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
		1519	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1092		1520
1093	$BUTTONBAR->add (new CFClient::UI::Button	1521	$BUTTONBAR->add (new CFClient::UI::Button
1094	text => "Save Config",	1522	text => "Save Config",
1095	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1523	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1096	on_activate => sub {	1524	on_activate => sub {
1097	$::CFG->{layout} = CFClient::UI::get_layout;	1525	$::CFG->{layout} = CFClient::UI::get_layout;
1098	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1526	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099	status "Configuration Saved";	1527	status "Configuration Saved";
1100	},	1528	},
1101	);	1529	);
1102		1530
1103	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1531	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
…		…
1114	}	1542	}
1115	},	1543	},
1116	);	1544	);
1117		1545
1118	$BUTTONBAR->show;	1546	$BUTTONBAR->show;
1119		1547	$SETUP_DIALOG->show;
1120	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122	$SERVER_SETUP->show;
1123	}	1548	}
		1549
		1550	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1124	}	1551	}
1125		1552
1126	sub video_shutdown {	1553	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1554	undef $SDL_ACTIVE;
1128	}	1555	}
…		…
1195		1622
1196	my %demo;#d#	1623	my %demo;#d#
1197		1624
1198	sub force_refresh {	1625	sub force_refresh {
1199	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1626	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1200	debug sprintf "%3.2f", $fps;	1627	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1628
1202	$CFClient::UI::ROOT->draw;	1629	$CFClient::UI::ROOT->draw;
1203		1630
1204	$WANT_REFRESH = 0;	1631	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1632	$CAN_REFRESH = 0;
…		…
1260	};	1687	};
1261		1688
1262	CFClient::SDL_GL_SwapBuffers;	1689	CFClient::SDL_GL_SwapBuffers;
1263	}	1690	}
1264		1691
1265	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	1692	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1266	$NOW = time;	1693	$NOW = time;
1267		1694
1268	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	1695	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1269	for CFClient::SDL_PollEvent;	1696	for CFClient::SDL_PollEvent;
1270		1697
…		…
1337	#############################################################################	1764	#############################################################################
1338		1765
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1766	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1767
1341	{	1768	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1769	local $SIG{__DIE__} = sub {
		1770	return unless defined $^S && !$^S;
		1771	Carp::confess $_[1];#d#TODO: remove when stable
		1772	CFClient::fatal $_[0];
		1773	};
1343		1774
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1775	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1776	CFClient::UI::set_layout ($::CFG->{layout});
1346		1777
1347	my %DEF_CFG = (	1778	my %DEF_CFG = (
1348	sdl_mode => 0,	1779	sdl_mode => 0,
1349	width => 640,	1780	width => 640,
…		…
1353	map_scale => 1,	1784	map_scale => 1,
1354	fow_enable => 1,	1785	fow_enable => 1,
1355	fow_intensity => 0.45,	1786	fow_intensity => 0.45,
1356	fow_smooth => 0,	1787	fow_smooth => 0,
1357	gui_fontsize => 1,	1788	gui_fontsize => 1,
1358	log_fontsize => 1,	1789	log_fontsize => 0.7,
1359	gauge_fontsize=> 1,	1790	gauge_fontsize=> 1,
1360	gauge_size => 0.35,	1791	gauge_size => 0.35,
1361	stat_fontsize => 1,	1792	stat_fontsize => 0.7,
1362	mapsize => 100,	1793	mapsize => 100,
1363	host => "crossfire.schmorp.de",	1794	host => "crossfire.schmorp.de",
1364	say_command => 'say',	1795	say_command => 'say',
1365	audio_enable => 1,	1796	audio_enable => 1,
1366	bgm_enable => 1,	1797	bgm_enable => 1,
…		…
1427		1858
1428	END { CFClient::SDL_Quit }	1859	END { CFClient::SDL_Quit }
1429		1860
1430	=head1 NAME	1861	=head1 NAME
1431		1862
1432	pclient - A Crossfire+ and Crossfire game client	1863	cfplus - A Crossfire+ and Crossfire game client
1433		1864
1434	=head1 SYNOPSIS	1865	=head1 SYNOPSIS
1435		1866
1436	Just run it - no commandline arguments are supported.	1867	Just run it - no commandline arguments are supported.
1437		1868
1438	=head1 USAGE	1869	=head1 USAGE
1439		1870
1440	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1871	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441	fullscreen and interactively.	1872	fullscreen and interactively.
1442		1873
		1874	=head1 DEBUGGING
		1875
		1876
		1877	CFPLUS_DEBUG - environment variable
		1878
		1879	1 draw borders around widgets
		1880	2 add low-level widget info to tooltips
		1881	4 show fps
		1882	8 suppress tooltips
		1883
1443	=head1 AUTHOR	1884	=head1 AUTHOR
1444		1885
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1886	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446		1887
1447		1888

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs. Revision 1.62 by root, Tue Jun 6 08:35:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.62 by root, Tue Jun 6 08:35:22 2006 UTC