ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.57 by root, Mon Jun 5 21:10:04 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
		3	my $startup_done = sub { };
		4
		5	# do splash-screen thingy on win32
		6	BEGIN {
		7	if (%PAR::LibCache && $^O eq "MSWin32") {
		8	while (my ($filename, $zip) = each %PAR::LibCache) {
		9	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
		10	}
		11
		12	require Win32::GUI::SplashScreen;
		13
		14	Win32::GUI::SplashScreen::Show (
		15	-file => "$ENV{PAR_TEMP}/SPLASH.bmp",
		16	);
		17
		18	$startup_done = sub {
		19	Win32::GUI::SplashScreen::Done (1);
		20	};
		21	}
		22	}
2		23
3	use strict;	24	use strict;
4	use utf8;	25	use utf8;
5		26
6	# do things only needed for single-binary version (par)	27	# do things only needed for single-binary version (par)
…		…
8	if (%PAR::LibCache) {	29	if (%PAR::LibCache) {
9	@INC = grep ref, @INC; # weed out all paths except pars loader refs	30	@INC = grep ref, @INC; # weed out all paths except pars loader refs
10		31
11	while (my ($filename, $zip) = each %PAR::LibCache) {	32	while (my ($filename, $zip) = each %PAR::LibCache) {
12	for ($zip->memberNames) {	33	for ($zip->memberNames) {
13	next unless /^\/root\/(.*)/;	34	next unless /^root\/(.*)/;
14	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	35	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15	unless -e "$ENV{PAR_TEMP}/$1";	36	unless -e "$ENV{PAR_TEMP}/$1";
16	}	37	}
17	}	38	}
18		39
…		…
32	use Crossfire;	53	use Crossfire;
33	use Crossfire::Protocol::Constants;	54	use Crossfire::Protocol::Constants;
34		55
35	use Compress::LZF;	56	use Compress::LZF;
36		57
37	use CFClient;	58	use CFPlus;
38	use CFClient::OpenGL ();	59	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	60	use CFPlus::Protocol;
40	use CFClient::UI;	61	use CFPlus::UI;
		62	use CFPlus::Pod;
		63	use CFPlus::BindingEditor;
41	use CFClient::MapWidget;	64	use CFPlus::MapWidget;
42		65
		66	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
		67	$SIG{PIPE} = 'IGNORE';
		68
		69	$Event::Eval = 0;
43	$Event::DIED = sub {	70	$Event::DIED = sub {
44	# TODO: display dialog box or so	71	# TODO: display dialog box or so
45	Carp::confess $_[1];#d#TODO: remove when stable	72	Carp::cluck $_[1];#d#TODO: remove when stable
46	CFClient::error $_[1];	73	return;#d#
		74	CFPlus::fatal ($_[1]);
47	};	75	};
48
49	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50
51	our $VERSION = '0.1';
52		76
53	my $MAX_FPS = 60;	77	my $MAX_FPS = 60;
54	my $MIN_FPS = 5; # unused as of yet	78	my $MIN_FPS = 5; # unused as of yet
55		79
56	our $META_SERVER = "crossfire.real-time.com:13326";	80	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
57		81
58	our $LAST_REFRESH;	82	our $LAST_REFRESH;
59	our $NOW;	83	our $NOW;
60		84
61	our $CFG;	85	our $CFG;
62	our $CONN;	86	our $CONN;
		87	our $PROFILE; # current profile
63	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	88	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
64		89
65	our $WANT_REFRESH;	90	our $WANT_REFRESH;
66	our $CAN_REFRESH;	91	our $CAN_REFRESH;
67		92
…		…
82	our $CONSOLE;	107	our $CONSOLE;
83	our $METASERVER;	108	our $METASERVER;
84	our $LOGIN_BUTTON;	109	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	110	our $QUIT_DIALOG;
86	our $HOST_ENTRY;	111	our $HOST_ENTRY;
		112	our $FULLSCREEN_ENABLE;
		113	our $PICKUP_ENABLE;
		114	our $SERVER_INFO;
87		115
88	our $SETUP_DIALOG;	116	our $SETUP_DIALOG;
89	our $SETUP_NOTEBOOK;	117	our $SETUP_NOTEBOOK;
90	our $SETUP_SERVER;	118	our $SETUP_SERVER;
91	our $SETUP_KEYBOARD;	119	our $SETUP_KEYBOARD;
92	our $SETUP_SPELLS;
93		120
		121	our $PL_NOTEBOOK;
		122	our $PL_WINDOW;
		123
		124	our $INVENTORY_PAGE;
		125	our $STATS_PAGE;
		126	our $SKILL_PAGE;
		127	our $SPELL_PAGE;
		128	our $SPELL_LIST;
		129
		130	our $HELP_WINDOW;
		131	our $MESSAGE_WINDOW;
94	our $FLOORBOX;	132	our $FLOORBOX;
95	our $GAUGES;	133	our $GAUGES;
96	our $STATWIDS;	134	our $STATWIDS;
97		135
98	our $SDL_ACTIVE;	136	our $SDL_ACTIVE;
…		…
104		142
105	our $ALT_ENTER_MESSAGE;	143	our $ALT_ENTER_MESSAGE;
106	our $STATUSBOX;	144	our $STATUSBOX;
107	our $DEBUG_STATUS;	145	our $DEBUG_STATUS;
108		146
109	our $INV_WINDOW;
110	our $INV;	147	our $INV;
111	our $INVR;	148	our $INVR;
112	our $INV_RIGHT_HB;	149	our $INV_RIGHT_HB;
113		150
114	our $BIND_EDITOR;	151	our $BIND_EDITOR;
		152	our $BIND_UPD_CB;
115		153
116	our $PICKUP_CFG;	154	our $PICKUP_CFG;
117		155
118	sub status {	156	sub status {
119	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	157	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
120	}	158	}
121		159
122	sub debug {	160	sub debug {
123	$DEBUG_STATUS->set_text ($_[0]);	161	$DEBUG_STATUS->set_text ($_[0]);
124	}	162	}
125		163
		164	sub message {
		165	my ($para) = @_;
		166
		167	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		168
		169	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
		170
		171	$LOGVIEW->add_paragraph ($para);
		172	$LOGVIEW->scroll_to_bottom;
		173	}
		174
		175	sub destroy_query_dialog {
		176	(delete $_[0]{query_dialog})->destroy
		177	if $_[0]{query_dialog};
		178	}
		179
		180	# server query dialog
		181	sub server_query {
		182	my ($conn, $flags, $prompt) = @_;
		183
		184	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
		185	x => "center",
		186	y => "center",
		187	title => "Server Query",
		188	child => my $vbox = new CFPlus::UI::VBox,
		189	;
		190
		191	my @dialog = my $label = new CFPlus::UI::Label
		192	max_w => $::WIDTH * 0.4,
		193	ellipsise => 0,
		194	text => $prompt;
		195
		196	if ($flags & CS_QUERY_YESNO) {
		197	push @dialog, my $hbox = new CFPlus::UI::HBox;
		198
		199	$hbox->add (new CFPlus::UI::Button
		200	text => "No",
		201	on_activate => sub {
		202	$conn->send ("reply n");
		203	$dialog->destroy;
		204	0
		205	}
		206	);
		207	$hbox->add (new CFPlus::UI::Button
		208	text => "Yes",
		209	on_activate => sub {
		210	$conn->send ("reply y");
		211	destroy_query_dialog $conn;
		212	0
		213	},
		214	);
		215
		216	$dialog->grab_focus;
		217
		218	} elsif ($flags & CS_QUERY_SINGLECHAR) {
		219	$dialog->{tooltip} = "#charcreation_focus";
		220
		221	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
		222	$MESSAGE_WINDOW->show;
		223
		224	unshift @dialog, new CFPlus::UI::Label
		225	max_w => $::WIDTH * 0.4,
		226	ellipsise => 0,
		227	markup => "\nOr use your keyboard and the text entry below:\n";
		228
		229	unshift @dialog, my $table = new CFPlus::UI::Table;
		230
		231	$table->add (0, 0, new CFPlus::UI::Button
		232	text => "Next Race",
		233	on_activate => sub {
		234	$conn->send ("reply n");
		235	destroy_query_dialog $conn;
		236	0
		237	},
		238	);
		239	$table->add (2, 0, new CFPlus::UI::Button
		240	text => "Accept",
		241	on_activate => sub {
		242	$conn->send ("reply d");
		243	destroy_query_dialog $conn;
		244	0
		245	},
		246	);
		247
		248	unshift @dialog, new CFPlus::UI::Label
		249	max_w => $::WIDTH * 0.4,
		250	ellipsise => 0,
		251	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
		252	;
		253
		254	} elsif ($prompt =~ /roll new stats/) {
		255	if (my $stat = delete $conn->{stat_change_with}) {
		256	$conn->send ("reply $stat");
		257	destroy_query_dialog $conn;
		258	return;
		259	}
		260
		261	$STATS_PAGE->show;
		262	$MESSAGE_WINDOW->hide;
		263
		264	unshift @dialog, new CFPlus::UI::Label
		265	max_w => $::WIDTH * 0.4,
		266	ellipsise => 0,
		267	markup => "\nOr use your keyboard and the text entry below:\n";
		268
		269	unshift @dialog, my $table = new CFPlus::UI::Table;
		270
		271	# left: re-roll
		272	$table->add (0, 0, new CFPlus::UI::Button
		273	text => "Roll Again",
		274	on_activate => sub {
		275	$conn->send ("reply y");
		276	destroy_query_dialog $conn;
		277	0
		278	},
		279	);
		280
		281	# center: swap stats
		282	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
		283	expand => 1,
		284	value => $_,
		285	options => [
		286	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
		287	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		288	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		289	[4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		290	[5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		291	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
		292	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
		293	],
		294	), 1 .. 2;
		295
		296	$table->add (2, 0, new CFPlus::UI::Button
		297	text => "Swap Stats",
		298	on_activate => sub {
		299	$conn->{stat_change_with} = $sw2->{value};
		300	$conn->send ("reply $sw1->{value}");
		301	destroy_query_dialog $conn;
		302	0
		303	},
		304	);
		305	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
		306
		307	# right: accept
		308	$table->add (4, 0, new CFPlus::UI::Button
		309	text => "Accept",
		310	on_activate => sub {
		311	$conn->send ("reply n");
		312	$STATS_PAGE->hide;
		313	destroy_query_dialog $conn;
		314	0
		315	},
		316	);
		317
		318	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
		319	for (
		320	[Str => CS_STAT_STR],
		321	[Dex => CS_STAT_DEX],
		322	[Con => CS_STAT_CON],
		323	[Int => CS_STAT_INT],
		324	[Wis => CS_STAT_WIS],
		325	[Pow => CS_STAT_POW],
		326	[Cha => CS_STAT_CHA],
		327	) {
		328	my ($name, $id) = @$_;
		329	$hbox->add (new CFPlus::UI::Label
		330	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
		331	align => 0,
		332	expand => 1,
		333	can_events => 1,
		334	can_hover => 1,
		335	tooltip => "#stat_$name",
		336	);
		337	}
		338
		339	unshift @dialog, new CFPlus::UI::Label
		340	max_w => $::WIDTH * 0.4,
		341	ellipsise => 0,
		342	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
		343	;
		344	}
		345
		346	push @dialog, my $entry = new CFPlus::UI::Entry
		347	on_changed => sub {
		348	$conn->send ("reply $_[1]");
		349	destroy_query_dialog $conn;
		350	0
		351	},
		352	;
		353
		354	$entry->grab_focus;
		355
		356	} else {
		357	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		358
		359	push @dialog, my $entry = new CFPlus::UI::Entry
		360	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
		361	on_activate => sub {
		362	$conn->send ("reply $_[1]");
		363	destroy_query_dialog $conn;
		364	0
		365	},
		366	;
		367
		368	$entry->grab_focus;
		369	}
		370
		371	$vbox->add (@dialog);
		372	$dialog->show;
		373	}
		374
126	sub start_game {	375	sub start_game {
127	status "logging in...";	376	status "logging in...";
128		377
129	$LOGIN_BUTTON->set_text ("Logout");	378	$LOGIN_BUTTON->set_text ("Logout");
130	$SETUP_DIALOG->hide;	379	$SETUP_DIALOG->hide;
131		380
		381	$PROFILE = $CFG->{profile}{default};
		382
132	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	383	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
133		384
134	my ($host, $port) = split /:/, $CFG->{host};	385	my ($host, $port) = split /:/, $PROFILE->{host};
135		386
136	$MAP = new CFClient::Map $mapsize, $mapsize;	387	$MAP = new CFPlus::Map;
137		388
138	$CONN = eval {	389	$CONN = eval {
139	new CFClient::Protocol	390	new CFPlus::Protocol
140	host => $host,	391	host => $host,
141	port => $port || 13327,	392	port => $port || 13327,
142	user => $CFG->{user},	393	user => $PROFILE->{user},
143	pass => $CFG->{password},	394	pass => $PROFILE->{password},
144	mapw => $mapsize,	395	mapw => $mapsize,
145	maph => $mapsize,	396	maph => $mapsize,
		397
		398	client => "cfplus $CFPlus::VERSION $] $^O",
146		399
147	map_widget => $MAPWIDGET,	400	map_widget => $MAPWIDGET,
148	logview => $LOGVIEW,	401	logview => $LOGVIEW,
149	statusbox => $STATUSBOX,	402	statusbox => $STATUSBOX,
150	map => $MAP,	403	map => $MAP,
151	mapmap => $MAPMAP,	404	mapmap => $MAPMAP,
		405	query => \&server_query,
152		406
153	sound_play => sub {	407	sound_play => sub {
154	my ($x, $y, $soundnum, $type) = @_;	408	my ($x, $y, $soundnum, $type) = @_;
155		409
156	$SDL_MIXER	410	$SDL_MIXER
…		…
162	$chunk->play;	416	$chunk->play;
163	},	417	},
164	};	418	};
165		419
166	if ($CONN) {	420	if ($CONN) {
167	CFClient::lowdelay fileno $CONN->{fh};	421	CFPlus::lowdelay fileno $CONN->{fh};
168		422
169	status "login successful";	423	status "login successful";
170	} else {	424	} else {
171	status "unable to connect";	425	status "unable to connect";
172	stop_game();	426	stop_game();
…		…
175		429
176	sub stop_game {	430	sub stop_game {
177	$LOGIN_BUTTON->set_text ("Login");	431	$LOGIN_BUTTON->set_text ("Login");
178	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	432	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179	$SETUP_DIALOG->show;	433	$SETUP_DIALOG->show;
180	$INV_WINDOW->hide;	434	$PL_WINDOW->hide;
		435	$SPELL_PAGE->clear_spells;
181		436
182	return unless $CONN;	437	return unless $CONN;
183		438
184	status "connection closed";	439	status "connection closed";
185		440
		441	destroy_query_dialog $CONN;
186	$CONN->destroy;	442	$CONN->destroy;
187	$CONN = 0; # false, does not autovivify	443	$CONN = 0; # false, does not autovivify
		444
		445	undef $MAP;
188	}	446	}
189		447
190	sub graphics_setup {	448	sub graphics_setup {
191	my $vbox = new CFClient::UI::VBox;	449	my $vbox = new CFPlus::UI::VBox;
192		450
193	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	451	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
194		452
195	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	453	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
196	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	454	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
197		455
198	$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]);	456	$hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
199	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	457	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
200		458
201	$mode_slider->connect (changed => sub {	459	$mode_slider->connect (changed => sub {
202	my ($self, $value) = @_;	460	my ($self, $value) = @_;
203		461
204	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	462	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
206	});	464	});
207	$mode_slider->emit (changed => $mode_slider->{range}[0]);	465	$mode_slider->emit (changed => $mode_slider->{range}[0]);
208		466
209	my $row = 1;	467	my $row = 1;
210		468
211	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	469	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
212	$table->add (1, $row++, new CFClient::UI::CheckBox	470	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
213	state => $CFG->{fullscreen},	471	state => $CFG->{fullscreen},
214	tooltip => "Bring the client into fullscreen mode.",	472	tooltip => "Bring the client into fullscreen mode.",
215	on_changed => sub {	473	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
216	my ($self, $value) = @_;
217	$CFG->{fullscreen} = $value;
218	}
219	);	474	);
220		475
221	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	476	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
222	$table->add (1, $row++, new CFClient::UI::CheckBox	477	$table->add (1, $row++, new CFPlus::UI::CheckBox
223	state => $CFG->{fast},	478	state => $CFG->{fast},
224	tooltip => "Lower the visual quality considerably to speed up rendering.",	479	tooltip => "Lower the visual quality considerably to speed up rendering.",
225	on_changed => sub {	480	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
226	my ($self, $value) = @_;
227	$CFG->{fast} = $value;
228	}
229	);	481	);
230		482
231	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	483	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
232	$table->add (1, $row++, new CFClient::UI::Slider	484	$table->add (1, $row++, new CFPlus::UI::Slider
233	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	485	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
234	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	486	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
235	on_changed => sub {	487	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
236	my ($self, $value) = @_;
237	$CFG->{map_scale} = 2 ** $value;
238	}
239	);	488	);
240		489
241	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	490	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
242	$table->add (1, $row++, new CFClient::UI::CheckBox	491	$table->add (1, $row++, new CFPlus::UI::CheckBox
243	state => $CFG->{fow_enable},	492	state => $CFG->{fow_enable},
244	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	493	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
245	on_changed => sub {	494	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
246	my ($self, $value) = @_;
247	$CFG->{fow_enable} = $value;
248	}
249	);	495	);
250		496
251	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	497	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
252	$table->add (1, $row++, new CFClient::UI::Slider	498	$table->add (1, $row++, new CFPlus::UI::Slider
253	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	499	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
254	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	500	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
255	on_changed => sub {	501	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
256	my ($self, $value) = @_;
257	$CFG->{fow_intensity} = $value;
258	}
259	);	502	);
260		503
261	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	504	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
262	$table->add (1, $row++, new CFClient::UI::CheckBox	505	$table->add (1, $row++, new CFPlus::UI::CheckBox
263	state => $CFG->{fow_smooth},	506	state => $CFG->{fow_smooth},
264	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	507	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
265	on_changed => sub {	508	on_changed => sub {
266	my ($self, $value) = @_;	509	my ($self, $value) = @_;
267	$CFG->{fow_smooth} = $value;	510	$CFG->{fow_smooth} = $value;
268	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	511	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
		512	0
269	}	513	}
270	);	514	);
271		515
272	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	516	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
273	$table->add (1, $row++, new CFClient::UI::Slider	517	$table->add (1, $row++, new CFPlus::UI::Slider
274	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	518	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
275	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	519	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
276	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	520	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
277	);	521	);
278		522
279	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	523	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
280	$table->add (1, $row++, new CFClient::UI::Slider	524	$table->add (1, $row++, new CFPlus::UI::Slider
281	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	525	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
282	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	526	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
283	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	527	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
284	);	528	);
285		529
286	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
287
288	$table->add (1, $row++, new CFClient::UI::Slider
289	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
290	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
291	on_changed => sub {
292	$CFG->{stat_fontsize} = $_[1];
293	&set_stats_window_fontsize;
294	}
295	);
296
297	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	530	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
298	$table->add (1, $row++, new CFClient::UI::Slider	531	$table->add (1, $row++, new CFPlus::UI::Slider
299	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	532	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
300	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	533	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
301	on_changed => sub {	534	on_changed => sub {
302	$CFG->{gauge_fontsize} = $_[1];	535	$CFG->{gauge_fontsize} = $_[1];
303	&set_gauge_window_fontsize;	536	&set_gauge_window_fontsize;
		537	0
304	}	538	}
305	);	539	);
306		540
307	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	541	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
308	$table->add (1, $row++, new CFClient::UI::Slider	542	$table->add (1, $row++, new CFPlus::UI::Slider
309	range => [$CFG->{gauge_size}, 0.2, 0.8],	543	range => [$CFG->{gauge_size}, 0.2, 0.8],
310	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	544	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
311	on_changed => sub {	545	on_changed => sub {
312	$CFG->{gauge_size} = $_[1];	546	$CFG->{gauge_size} = $_[1];
313	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	547	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		548	0
314	}	549	}
315	);	550	);
316		551
317	$table->add (1, $row++, new CFClient::UI::Button	552	$table->add (1, $row++, new CFPlus::UI::Button
318	expand => 1, align => 0, text => "Apply",	553	expand => 1, align => 0, text => "Apply",
319	tooltip => "Apply the video settings",	554	tooltip => "Apply the video settings",
320	on_activate => sub {	555	on_activate => sub {
321	video_shutdown ();	556	video_shutdown ();
322	video_init ();	557	video_init ();
		558	0
323	}	559	}
324	);	560	);
325		561
326	$vbox	562	$vbox
327	}	563	}
328		564
329	sub audio_setup {	565	sub audio_setup {
330	my $vbox = new CFClient::UI::VBox;	566	my $vbox = new CFPlus::UI::VBox;
331		567
332	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	568	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
333		569
334	my $row = 0;	570	my $row = 0;
335		571
336	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	572	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
337	$table->add (1, $row++, new CFClient::UI::CheckBox	573	$table->add (1, $row++, new CFPlus::UI::CheckBox
338	state => $CFG->{audio_enable},	574	state => $CFG->{audio_enable},
339	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.",	575	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.",
340	on_changed => sub {	576	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
341	$CFG->{audio_enable} = $_[1];
342	}
343	);	577	);
344	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	578	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
345	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	579	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
346	# $CFG->{effects_volume} = $_[1];	580	# $CFG->{effects_volume} = $_[1];
347	# });	581	# });
348	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	582	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
349	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	583	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
350	$hbox->add (new CFClient::UI::CheckBox	584	$hbox->add (new CFPlus::UI::CheckBox
351	expand => 1, state => $CFG->{bgm_enable},	585	expand => 1, state => $CFG->{bgm_enable},
352	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	586	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
353	on_changed => sub {	587	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
354	$CFG->{bgm_enable} = $_[1];
355	}
356	);	588	);
357	$hbox->add (new CFClient::UI::Slider	589	$hbox->add (new CFPlus::UI::Slider
358	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	590	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
359	tooltip => "The volume of the background music. Changes are instant.",	591	tooltip => "The volume of the background music. Changes are instant.",
360	on_changed => sub {	592	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
361	$CFG->{bgm_volume} = $_[1];
362	CFClient::MixMusic::volume $_[1] * 128;
363	}
364	);	593	);
365		594
366	$table->add (1, $row++, new CFClient::UI::Button	595	$table->add (1, $row++, new CFPlus::UI::Button
367	expand => 1, align => 0, text => "Apply",	596	expand => 1, align => 0, text => "Apply",
368	tooltip => "Apply the audio settings",	597	tooltip => "Apply the audio settings",
369	on_activate => sub {	598	on_activate => sub {
370	audio_shutdown ();	599	audio_shutdown ();
371	audio_init ();	600	audio_init ();
		601	0
372	}	602	}
373	);	603	);
374		604
375	$vbox	605	$vbox
376	}
377
378	sub set_stats_window_fontsize {
379	for (values %{$STATWIDS}) {
380	$_->set_fontsize ($::CFG->{stat_fontsize});
381	}
382	}	606	}
383		607
384	sub set_gauge_window_fontsize {	608	sub set_gauge_window_fontsize {
385	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {	609	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
386	$_->set_fontsize ($::CFG->{gauge_fontsize});	610	$_->set_fontsize ($::CFG->{gauge_fontsize});
…		…
388	}	612	}
389		613
390	sub make_gauge_window {	614	sub make_gauge_window {
391	my $gh = int $HEIGHT * $CFG->{gauge_size};	615	my $gh = int $HEIGHT * $CFG->{gauge_size};
392		616
393	my $win = new CFClient::UI::Frame (	617	my $win = new CFPlus::UI::Frame (
394	force_x => 0,	618	force_x => 0,
395	force_y => "max",	619	force_y => "max",
396	force_w => $WIDTH,	620	force_w => $WIDTH,
397	force_h => $gh,	621	force_h => $gh,
398	);	622	);
399		623
400	$win->add (my $hbox = new CFClient::UI::HBox	624	$win->add (my $hbox = new CFPlus::UI::HBox
401	children => [	625	children => [
402	(new CFClient::UI::HBox expand => 1),	626	(new CFPlus::UI::HBox expand => 1),
403	(new CFClient::UI::VBox children => [	627	(new CFPlus::UI::VBox children => [
404	(new CFClient::UI::Empty expand => 1),	628	(new CFPlus::UI::Empty expand => 1),
405	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	629	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
406	]),	630	]),
407	(my $vbox = new CFClient::UI::VBox),	631	(my $vbox = new CFPlus::UI::VBox),
408	],	632	],
409	);	633	);
410		634
411	$vbox->add (new CFClient::UI::HBox	635	$vbox->add (new CFPlus::UI::HBox
412	expand => 1,	636	expand => 1,
413	children => [	637	children => [
414	(new CFClient::UI::Empty expand => 1),	638	(new CFPlus::UI::Empty expand => 1),
415	(my $hb = new CFClient::UI::HBox),	639	(my $hb = new CFPlus::UI::HBox),
416	],	640	],
417	);	641	);
418		642
419	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	643	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
420	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
421	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	644	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
422	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
423	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	645	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
424	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
425	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	646	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
426	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
427		647
428	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	648	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
429	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
430	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	649	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
431	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
432		650
433	$GAUGES = {	651	$GAUGES = {
434	exp => $exp, win => $win, range => $rng,	652	exp => $exp, win => $win, range => $rng,
435	food => $fg, mana => $mg, hp => $hg, grace => $gg	653	food => $fg, mana => $mg, hp => $hg, grace => $gg
436	};	654	};
…		…
438	&set_gauge_window_fontsize;	656	&set_gauge_window_fontsize;
439		657
440	$win	658	$win
441	}	659	}
442		660
		661	sub debug_setup {
		662	my $table = new CFPlus::UI::Table;
443		663
		664	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
		665	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
		666	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
		667	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
		668	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
		669	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
		670	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
		671	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		672
		673	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
		674
		675	for my $x (0..2) {
		676	for my $y (0 .. 2) {
		677	$table->add ($x + 3, $y,
		678	new CFPlus::UI::Entry
		679	text => $default_smooth[$x * 3 + $y],
		680	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
		681	);
		682	}
		683	}
		684
		685
		686	$table
		687	}
		688
444	sub make_stats_window {	689	sub stats_window {
445	my $tgw = new CFClient::UI::FancyFrame	690	my $r = new CFPlus::UI::ScrolledWindow (
446	y => $HEIGHT * (2/8),	691	expand => 1,
447	x => "max",	692	scroll_y => 1
448	title => "Stats",	693	);
449	name => "stats_window";	694	$r->add (my $vb = new CFPlus::UI::VBox);
450		695
451	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	696	$vb->add (new CFPlus::UI::FancyFrame
		697	label => "Player",
		698	child => (my $pi = new CFPlus::UI::VBox),
		699	);
		700
452	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	701	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453	can_hover => 1, can_events => 1,	702	can_hover => 1, can_events => 1,
454	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	703	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
455	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	704	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
456	can_hover => 1, can_events => 1,	705	can_hover => 1, can_events => 1,
457	tooltip => "The map you are currently on (if supported by the server).");	706	tooltip => "The map you are currently on (if supported by the server).");
458		707
459	$vb->add (my $hb0 = new CFClient::UI::HBox);	708	$pi->add (my $hb0 = new CFPlus::UI::HBox);
460	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	709	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
461	can_hover => 1, can_events => 1,	710	can_hover => 1, can_events => 1,
462	tooltip => "The weight of the player including all inventory items.");	711	tooltip => "The weight of the player including all inventory items.");
463	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	712	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
464	can_hover => 1, can_events => 1,	713	can_hover => 1, can_events => 1,
465	tooltip => "The weight limit: you cannot carry more than this.");	714	tooltip => "The weight limit: you cannot carry more than this.");
466		715
467		716	$vb->add (new CFPlus::UI::FancyFrame
		717	label => "Primary/Secondary Statistics",
468	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	718	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		719	);
469	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	720	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
470		721
471	my $color2 = [1, 1, 0];	722	my $color2 = [1, 1, 0];
472		723
473	for (	724	for (
474	[0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],	725	[0, 0, st_str => "Str", 30],
475	[0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],	726	[0, 1, st_dex => "Dex", 30],
476	[0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],	727	[0, 2, st_con => "Con", 30],
477	[0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],	728	[0, 3, st_int => "Int", 30],
478	[0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],	729	[0, 4, st_wis => "Wis", 30],
479	[0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],	730	[0, 5, st_pow => "Pow", 30],
480	[0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],	731	[0, 6, st_cha => "Cha", 30],
481		732
482	[2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],	733	[2, 0, st_wc => "Wc", -120],
483	[2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],	734	[2, 1, st_ac => "Ac", -120],
484	[2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],	735	[2, 2, st_dam => "Dam", 120],
485	[2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],	736	[2, 3, st_arm => "Arm", 120],
486	[2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],	737	[2, 4, st_spd => "Spd", 10.54],
487	[2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],	738	[2, 5, st_wspd => "WSp", 10.54],
488	) {	739	) {
489	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	740	my ($col, $row, $id, $label, $template) = @$_;
490		741
491	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	742	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
492	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);	743	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		744	align => +1, template => $template, tooltip => "#stat_$label");
493	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	745	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
494	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);	746	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		747	align => -1, text => $label, tooltip => "#stat_$label");
495	}	748	}
496		749
		750	$vb->add (new CFPlus::UI::FancyFrame
		751	label => "Resistancies",
497	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	752	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		753	);
498		754
499	my $row = 0;	755	my $row = 0;
500	my $col = 0;	756	my $col = 0;
501		757
502	my %resist_names = (	758	my %resist_names = (
		759	slow => ["Slow",
503	slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",	760	"<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
		761	holyw => ["Holy Word",
504	holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",	762	"<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
		763	conf => ["Confusion",
505	conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",	764	"<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
		765	fire => ["Fire",
506	fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",	766	"<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
		767	depl => ["Depletion",
507	depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",	768	"<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
		769	magic => ["Magic",
508	magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",	770	"<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
		771	drain => ["Draining",
509	drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",	772	"<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
		773	acid => ["Acid",
510	acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",	774	"<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
		775	pois => ["Poison",
511	pois => "<b>Poison</b> (resistance to getting poisoned)",	776	"<b>Poison</b> (resistance to getting poisoned)"],
		777	para => ["Paralysation",
512	para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",	778	"<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
		779	deat => ["Death",
513	deat => "<b>Death</b> (resistance against death spells)",	780	"<b>Death</b> (resistance against death spells)"],
514	phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",	781	phys => ["Physical",
		782	"<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
		783	blind => ["Blind",
515	blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",	784	"<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
		785	fear => ["Fear",
516	fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",	786	"<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
		787	tund => ["Turn undead",
517	tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",	788	"<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
		789	elec => ["Electricity",
518	elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",	790	"<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
		791	cold => ["Cold",
519	cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",	792	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
		793	ghit => ["Ghost hit",
520	ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",	794	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
521	);	795	);
522	for (qw/slow holyw conf fire depl magic	796	for (qw/slow holyw conf fire depl magic
523	drain acid pois para deat phys	797	drain acid pois para deat phys
524	blind fear tund elec cold ghit/)	798	blind fear tund elec cold ghit/)
525	{	799	{
526	$tbl2->add ($col, $row,	800	$tbl2->add ($col, $row,
527	$STATWIDS->{"res_$_"} =	801	$STATWIDS->{"res_$_"} =
528	new CFClient::UI::Label	802	new CFPlus::UI::Label
529	font => $FONT_FIXED,	803	font => $FONT_FIXED,
530	template => "-100%",	804	template => "-100%",
531	align => +1,	805	align => +1,
532	valign => 0,	806	valign => 0,
533	can_events => 1,	807	can_events => 1,
534	can_hover => 1,	808	can_hover => 1,
535	tooltip => $resist_names{$_},	809	tooltip => $resist_names{$_}->[1],
536	);	810	);
537	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	811	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
538	font => $FONT_FIXED,	812	font => $FONT_FIXED,
539	can_hover => 1,	813	can_hover => 1,
540	can_events => 1,	814	can_events => 1,
541	image => "ui/resist/resist_$_.png",	815	path => "ui/resist/resist_$_.png",
542	tooltip => $resist_names{$_},	816	tooltip => $resist_names{$_}->[1],
		817	);
		818	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
		819	text => $resist_names{$_}->[0],
		820	font => $FONT_FIXED,
		821	can_hover => 1,
		822	can_events => 1,
		823	tooltip => $resist_names{$_}->[1],
543	);	824	);
544		825
545	$row++;	826	$row++;
546	if ($row % 6 == 0) {	827	if ($row % 6 == 0) {
547	$col += 2;	828	$col += 3;
548	$row = 0;	829	$row = 0;
549	}	830	}
550	}	831	}
551		832
552	&set_stats_window_fontsize;
553	update_stats_window ({});	833	#update_stats_window ({});
554		834
		835	$r
		836	}
		837
		838	sub skill_window {
		839	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
		840	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
555	$tgw	841	$sw
556	}	842	}
557		843
558	sub formsep($) {	844	sub formsep($) {
559	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	845	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560	}	846	}
561		847
562	sub update_stats_window {
563	my ($stats) = @_;
564
565	# I love text protocols...
566
567	my $hp = $stats->{+CS_STAT_HP} * 1;
568	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
569	my $sp = $stats->{+CS_STAT_SP} * 1;
570	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
571	my $fo = $stats->{+CS_STAT_FOOD} * 1;
572	my $fo_m = 999;
573	my $gr = $stats->{+CS_STAT_GRACE} * 1;
574	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
575
576	$GAUGES->{hp} ->set_value ($hp, $hp_m);
577	$GAUGES->{mana} ->set_value ($sp, $sp_m);
578	$GAUGES->{food} ->set_value ($fo, $fo_m);
579	$GAUGES->{grace} ->set_value ($gr, $gr_m);
580	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
581	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
582	my $rng = $stats->{+CS_STAT_RANGE};
583	$rng =~ s/^Range: //; # thank you so much dear server
584	$GAUGES->{range} ->set_text ("Rng: " . $rng);
585	my $title = $stats->{+CS_STAT_TITLE};
586	$title =~ s/^Player: //;
587	$STATWIDS->{title} ->set_text ("Title: " . $title);
588
589	$STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
590	$STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
591	$STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
592	$STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
593	$STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
594	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
595	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
596	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
597	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
598	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
599	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
600	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
601	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
602
603	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
604
605	# TODO: replace by CS_STAT_RES_xxx constants
606	my %tbl = (
607	phys => 100,
608	magic => 101,
609	fire => 102,
610	elec => 103,
611	cold => 104,
612	conf => 105,
613	acid => 106,
614	drain => 107,
615	ghit => 108,
616	pois => 109,
617	slow => 110,
618	para => 111,
619	tund => 112,
620	fear => 113,
621	depl => 113,
622	deat => 115,
623	holyw => 116,
624	blind => 117,
625	);
626
627	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628	for keys %tbl;
629	}
630
631	my $METASERVER_ATIME;	848	my $METASERVER_ATIME;
632		849
633	sub update_metaserver {	850	sub update_metaserver {
		851	my ($metaserver_dialog) = @_;
		852
		853	$METASERVER = $metaserver_dialog
		854	if defined $metaserver_dialog;
		855
634	return if $METASERVER_ATIME > time;	856	return if $METASERVER_ATIME > time;
635	$METASERVER_ATIME = time + 60;	857	$METASERVER_ATIME = time + 60;
636		858
637	my $table = $METASERVER->{table};	859	my $table = $METASERVER->{table};
638	$table->clear;	860	$table->clear;
639	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	861	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
640		862
641	my $buf;	863	my $ok = 0;
642		864
643	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	865	CFPlus::background {
		866	my $ua = CFPlus::lwp_useragent;
644		867
645	unless ($fh) {	868	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
646	$label->set_text ("unable to contact metaserver: $!");	869	} sub {
647	return;	870	my ($msg) = @_;
648	}	871	if ($msg) {
649
650	Event->io (fd => $fh, poll => 'r', cb => sub {
651	my $res = sysread $fh, $buf, 8192, length $buf;
652
653	if (!defined $res) {
654	$_[0]->w->cancel;
655	$label->set_text ("error while retrieving server list: $!");
656	} elsif ($res == 0) {
657	$_[0]->w->cancel;
658	status "server list retrieved";
659
660	utf8::decode $buf if utf8::valid $buf;
661
662	$table->clear;	872	$table->clear;
663		873
		874	my @tip = (
		875	"The current number of users logged in on the server.",
		876	"The hostname of the server.",
		877	"The time this server has been running without being restarted.",
		878	"The server software version - a '+' indicates a Crossfire+ server.",
		879	"Short information about this server provided by its admins.",
		880	);
664	my @col = qw(Use #Users Host Uptime Version Description);	881	my @col = qw(#Users Host Uptime Version Description);
665	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	882	$table->add ($_, 0, new CFPlus::UI::Label
		883	can_hover => 1, can_events => 1,
		884	align => 0, fg => [1, 1, 0],
		885	text => $col[$_], tooltip => $tip[$_])
666	for 0 .. $#col;	886	for 0 .. $#col;
667		887
668	my @align = qw(1 0 1 1 -1);	888	my @align = qw(1 0 1 1 -1);
669		889
670	my $y = 0;	890	my $y = 0;
671	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	891	for my $m (
		892	sort {
		893	$b->{version} <=> $a->{version}
		894	or $b->{users} <=> $a->{users}
		895	}
		896	@{ $msg->{servers} }
		897	) {
672	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	898	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
		899	@$m{qw(ip age hostname users version description ibytes obytes uptime)};
673		900
674	for ($desc) {	901	for ($desc) {
675	s/<br>/\n/gi;	902	s/<br>/\n/gi;
676	s/<li>/\n· /gi;	903	s/<li>/\n· /gi;
677	s/<.*?>//sgi;	904	s/<.*?>//sgi;
678	s/&/&amp;/g;	905	s/&amp;/&/g;
679	s/</&lt;/g;	906	s/&lt;/</g;
680	s/>/&gt;/g;	907	s/&gt;/>/g;
681	}	908	}
682		909
683	$uptime = sprintf "%dd %02d:%02d:%02d",	910	$uptime = sprintf "%dd %02d:%02d:%02d",
684	(int $m->[8] / 86400),	911	(int $uptime / 86400),
685	(int $m->[8] / 3600) % 24,	912	(int $uptime / 3600) % 24,
686	(int $m->[8] / 60) % 60,	913	(int $uptime / 60) % 60,
687	$m->[8] % 60;	914	$uptime % 60;
688		915
689	$m = [$users, $host, $uptime, $version, $desc];	916	$m = [$users, $host, $uptime, $version, $desc];
690		917
691	$y++;	918	$y++;
692		919
693	$table->add (0, $y, new CFClient::UI::VBox children => [	920	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
694	(new CFClient::UI::Button text => "Use", on_activate => sub {	921	(new CFPlus::UI::Button
		922	text => "Use",
		923	tooltip => "Put this server into the <b>Host:Port</b> field",
		924	on_activate => sub {
695	$HOST_ENTRY->set_text ($CFG->{host} = $host);	925	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
696	$METASERVER->toggle_visibility;	926	$METASERVER->hide;
		927	0
		928	},
697	}),	929	),
698	(new CFClient::UI::Empty expand => 1),	930	(new CFPlus::UI::Empty expand => 1),
699	]);	931	]);
700		932
701	$table->add ($_ + 1, $y, new CFClient::UI::Label	933	$table->add ($_, $y, new CFPlus::UI::Label
702	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	934	max_w => $::WIDTH * 0.4,
		935	ellipsise => 0,
		936	align => $align[$_],
		937	text => $m->[$_],
		938	tooltip => $tip[$_],
		939	fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
		940	can_hover => 1,
		941	can_events => 1,
		942	fontsize => 0.8)
703	for 0 .. $#$m;	943	for 0 .. $#$m;
704	}	944	}
		945	} else {
		946	$ok or $label->set_text ("error while contacting metaserver");
705	}	947	}
706	});	948	};
		949
707	}	950	}
708		951
709	sub metaserver_dialog {	952	sub metaserver_dialog {
710	my $dialog = new CFClient::UI::FancyFrame	953	my $vbox = new CFPlus::UI::VBox;
		954	my $table = new CFPlus::UI::Table;
		955	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
		956
		957	my $dialog = new CFPlus::UI::Toplevel
711	title => "Server List",	958	title => "Server List",
712	name => 'metaserver_dialog',	959	name => 'metaserver_dialog',
713	x => 'center',	960	x => 'center',
714	y => 'center',	961	y => 'center',
715	z => 3,	962	z => 3,
716	child => (my $vbox = new CFClient::UI::VBox),	963	force_w => $::WIDTH * 0.9,
		964	force_h => $::HEIGHT * 0.7,
		965	child => $vbox,
		966	has_close_button => 1,
		967	table => $table,
717	on_visibility_change => sub {	968	on_visibility_change => sub {
718	update_metaserver if $_[1];	969	update_metaserver ($_[0]) if $_[1];
		970	0
719	},	971	},
720	;	972	;
721		973
722	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
723
724	$dialog	974	$dialog
725	}	975	}
726		976
727	sub server_setup {	977	sub server_setup {
728	my $vbox = new CFClient::UI::VBox;	978	my $vbox = new CFPlus::UI::VBox;
729		979
		980	$vbox->add (new CFPlus::UI::FancyFrame
		981	label => "Connection Settings",
730	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	982	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		983	);
731	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	984	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
732		985
733	{	986	{
734	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	987	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
735		988
736	$vbox->add (	989	$vbox->add (
737	$HOST_ENTRY = new CFClient::UI::Entry	990	$HOST_ENTRY = new CFPlus::UI::Entry
738	expand => 1,	991	expand => 1,
739	text => $CFG->{host},	992	text => $CFG->{profile}{default}{host},
740	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	993	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741	on_changed => sub {	994	on_changed => sub {
742	my ($self, $value) = @_;	995	my ($self, $value) = @_;
743	$CFG->{host} = $value;	996	$CFG->{profile}{default}{host} = $value;
		997	0
744	}	998	}
745	);	999	);
746		1000
747	$METASERVER = metaserver_dialog;
748
749	$vbox->add (new CFClient::UI::Button	1001	$vbox->add (new CFPlus::UI::Button
750	expand => 1,	1002	expand => 1,
751	text => "Server List",	1003	text => "Server List",
752	other => $METASERVER,	1004	other => $METASERVER,
753	tooltip => "Show a list of available crossfire servers",	1005	tooltip => "Show a list of available crossfire servers",
754	on_activate => sub { $METASERVER->toggle_visibility },	1006	on_activate => sub { $METASERVER->toggle_visibility; 0 },
		1007	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755	);	1008	);
756	}	1009	}
757		1010
758	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1011	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
759	$table->add (1, 4, new CFClient::UI::Entry	1012	$table->add (1, 4, new CFPlus::UI::Entry
760	text => $CFG->{user},	1013	text => $CFG->{profile}{default}{user},
761	tooltip => "The name of your character on the server",	1014	tooltip => "The name of your character on the server",
762	on_changed => sub {	1015	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763	my ($self, $value) = @_;
764	$CFG->{user} = $value;
765	}
766	);	1016	);
767		1017
768	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1018	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
769	$table->add (1, 5, new CFClient::UI::Entry	1019	$table->add (1, 5, new CFPlus::UI::Entry
770	text => $CFG->{password},	1020	text => $CFG->{profile}{default}{password},
771	hidden => 1,	1021	hidden => 1,
772	tooltip => "The password for your character",	1022	tooltip => "The password for your character",
773	on_changed => sub {	1023	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774	my ($self, $value) = @_;
775	$CFG->{password} = $value;
776	}
777	);	1024	);
778		1025
779	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1026	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
780	$table->add (1, 7, new CFClient::UI::Slider	1027	$table->add (1, 7, new CFPlus::UI::Slider
781	force_w => 100,	1028	force_w => 100,
782	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1029	range => [$CFG->{mapsize}, 10, 100, 0, 1],
783	tooltip => "This is the size of the portion of the map update the server sends you. "	1030	tooltip => "This is the size of the portion of the map update the server sends you. "
784	. "If you set this to a high value you will be able to see further, "	1031	. "If you set this to a high value you will be able to see further, "
785	. "but you also increase bandwidth requirements and latency. "	1032	. "but you also increase bandwidth requirements and latency. "
786	. "This option is only used once at log-in.",	1033	. "This option is only used once at log-in.",
787	on_changed => sub {	1034	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788	my ($self, $value) = @_;
789
790	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791	},
792	);	1035	);
793		1036
794	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1037	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
795	$table->add (1, 8, new CFClient::UI::CheckBox	1038	$table->add (1, 8, new CFPlus::UI::CheckBox
796	state => $CFG->{face_prefetch},	1039	state => $CFG->{face_prefetch},
797	tooltip => "<b>Background Image Prefetch</b>\n\n"	1040	tooltip => "<b>Background Image Prefetch</b>\n\n"
798	. "If enabled, the client automatically pre-fetches images from the server. "	1041	. "If enabled, the client automatically pre-fetches images from the server. "
799	. "This might increase or create lag, but increases the chances "	1042	. "This might increase or create lag, but increases the chances "
800	. "of faces being ready for display when you encounter them. "	1043	. "of faces being ready for display when you encounter them. "
801	. "It also uses up server bandwidth on every connect, "	1044	. "It also uses up server bandwidth on every connect, "
802	. "so only set it if you really need to prefetch images. "	1045	. "so only set it if you really need to prefetch images. "
803	. "This option can be set and unset any time.",	1046	. "This option can be set and unset any time.",
804	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1047	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805	);	1048	);
806		1049
807	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1050	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
808	$table->add (1, 9, new CFClient::UI::Entry	1051	$table->add (1, 9, new CFPlus::UI::Entry
809	text => $CFG->{output_count},	1052	text => $CFG->{output_count},
810	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1053	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
811	on_changed => sub { $CFG->{output_count} = $_[1] },	1054	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812	);	1055	);
813		1056
814	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1057	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
815	$table->add (1, 10, new CFClient::UI::Entry	1058	$table->add (1, 10, new CFPlus::UI::Entry
816	text => $CFG->{output_sync},	1059	text => $CFG->{output_sync},
817	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1060	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
818	on_changed => sub { $CFG->{output_sync} = $_[1] },	1061	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819	);	1062	);
820		1063
821	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1064	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
822	expand => 1,	1065	expand => 1,
823	align => 0,	1066	align => 0,
824	text => "Login",	1067	text => "Login",
825	on_activate => sub {	1068	on_activate => sub {
826	$CONN ? stop_game	1069	$CONN ? stop_game
827	: start_game;	1070	: start_game;
		1071	0
828	},	1072	},
829	);	1073	);
830		1074
831	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1075	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
832	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1076	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
833	text => $CFG->{say_command},	1077	text => $CFG->{say_command},
834	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. "	1078	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. "
835	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1079	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1080	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837	on_changed => sub {	1081	on_changed => sub {
838	my ($self, $value) = @_;	1082	my ($self, $value) = @_;
839	$CFG->{say_command} = $value;	1083	$CFG->{say_command} = $value;
		1084	0
840	}	1085	}
841	);	1086	);
842		1087
		1088	$table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
		1089	$table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
		1090	state => $CFG->{show_tips},
		1091	tooltip => "Show the <b>Tip of the day</b> window at startup?",
		1092	on_changed => sub {
		1093	my ($self, $value) = @_;
		1094	$CFG->{show_tips} = $value;
		1095	0
		1096	}
		1097	);
		1098
		1099	$vbox->add (new CFPlus::UI::FancyFrame
		1100	label => "Server Info",
		1101	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1102	);
		1103
843	$vbox	1104	$vbox
844	}	1105	}
845		1106
846	sub message_window {	1107	sub message_window {
847	my $window = new CFClient::UI::FancyFrame	1108	my $window = new CFPlus::UI::Toplevel
848	name => "message_window",	1109	name => "message_window",
849	title => "Messages",	1110	title => "Messages",
850	border_bg => [1, 1, 1, 1],	1111	border_bg => [1, 1, 1, 1],
851	bg => [0, 0, 0, 0.75],
852	x => "max",	1112	x => "max",
853	y => 0,	1113	y => 0,
854	force_w => $::WIDTH / 3,	1114	force_w => $::WIDTH * 0.4,
855	force_h => $::HEIGHT / 5,	1115	force_h => $::HEIGHT * 0.5,
856	child => (my $vbox = new CFClient::UI::VBox);	1116	child => (my $vbox = new CFPlus::UI::VBox),
		1117	has_close_button => 1;
857		1118
858	$vbox->add ($LOGVIEW);	1119	$vbox->add ($LOGVIEW);
859		1120
860	$vbox->add (my $input = new CFClient::UI::Entry	1121	$vbox->add (my $input = new CFPlus::UI::Entry
861	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1122	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
862	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1123	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
863	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1124	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
864	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1125	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
865	on_focus_in => sub {	1126	on_focus_in => sub {
…		…
869		1130
870	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1131	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871	$input->{refocus_map} = 1;	1132	$input->{refocus_map} = 1;
872	}	1133	}
873	delete $input->{auto_activated};	1134	delete $input->{auto_activated};
		1135
		1136	0
874	},	1137	},
875	on_activate => sub {	1138	on_activate => sub {
876	my ($input, $text) = @_;	1139	my ($input, $text) = @_;
877	$input->set_text ('');	1140	$input->set_text ('');
878		1141
…		…
884	}	1147	}
885	if ($input->{refocus_map}) {	1148	if ($input->{refocus_map}) {
886	delete $input->{refocus_map};	1149	delete $input->{refocus_map};
887	$MAPWIDGET->focus_in	1150	$MAPWIDGET->focus_in
888	}	1151	}
		1152
		1153	0
889	},	1154	},
890	on_escape => sub {	1155	on_escape => sub {
891	$MAPWIDGET->focus_in	1156	$MAPWIDGET->grab_focus;
		1157
		1158	0
892	},	1159	},
893	);	1160	);
894		1161
895	$CONSOLE = {	1162	$CONSOLE = {
896	window => $window,	1163	window => $window,
…		…
898	};	1165	};
899		1166
900	$window	1167	$window
901	}	1168	}
902		1169
903	sub open_quit_dialog {
904	unless ($QUIT_DIALOG) {
905	$QUIT_DIALOG = new CFClient::UI::FancyFrame
906	x => "center",
907	y => "center",
908	z => 50,
909	title => "Really Quit?",
910	;
911
912	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
913
914	$vb->add (new CFClient::UI::Label
915	text => "You should find a savebed and apply it first!",
916	max_w => $WIDTH * 0.25,
917	ellipsize => 0,
918	);
919	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
920	$hb->add (new CFClient::UI::Button
921	text => "Ok",
922	expand => 1,
923	on_activate => sub { $QUIT_DIALOG->hide },
924	);
925	$hb->add (new CFClient::UI::Button
926	text => "Quit anyway",
927	expand => 1,
928	on_activate => sub { exit },
929	);
930	}
931
932	$QUIT_DIALOG->show;
933	}
934
935	sub autopickup_setup {	1170	sub autopickup_setup {
936	my $table = new CFClient::UI::Table;	1171	my $table = new CFPlus::UI::Table;
937		1172
938	for (	1173	for (
939	["General", 0, 0,	1174	["General", 0, 0,
940	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],	1175	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
941	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],	1176	["Inhibit autopickup" => PICKUP_INHIBIT],
942	["Stop before pickup" => CFClient::Pickup::PU_STOP],	1177	["Stop before pickup" => PICKUP_STOP],
943	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],	1178	["Debug autopickup" => PICKUP_DEBUG],
944	],	1179	],
945	["Weapons", 0, 6,	1180	["Weapons", 0, 6,
946	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],	1181	["All weapons" => PICKUP_ALLWEAPON],
947	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],	1182	["Missile weapons" => PICKUP_MISSILEWEAPON],
948	["Bows" => CFClient::Pickup::PU_BOW],	1183	["Bows" => PICKUP_BOW],
949	["Arrows" => CFClient::Pickup::PU_ARROW],	1184	["Arrows" => PICKUP_ARROW],
950	],	1185	],
951	["Armour", 0, 12,	1186	["Armour", 0, 12,
952	["Helmets" => CFClient::Pickup::PU_HELMET],	1187	["Helmets" => PICKUP_HELMET],
953	["Shields" => CFClient::Pickup::PU_SHIELD],	1188	["Shields" => PICKUP_SHIELD],
954	["Body Armour" => CFClient::Pickup::PU_ARMOUR],	1189	["Body Armour" => PICKUP_ARMOUR],
955	["Boots" => CFClient::Pickup::PU_BOOTS],	1190	["Boots" => PICKUP_BOOTS],
956	["Gloves" => CFClient::Pickup::PU_GLOVES],	1191	["Gloves" => PICKUP_GLOVES],
957	["Cloaks" => CFClient::Pickup::PU_CLOAK],	1192	["Cloaks" => PICKUP_CLOAK],
958	],	1193	],
959		1194
960	["Readables", 2, 2,	1195	["Readables", 2, 2,
961	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],	1196	["Spellbooks" => PICKUP_SPELLBOOK],
962	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],	1197	["Skillscrolls" => PICKUP_SKILLSCROLL],
963	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],	1198	["Normal Books/Scrolls" => PICKUP_READABLES],
964	],	1199	],
965	["Misc", 2, 7,	1200	["Misc", 2, 7,
966	["Food" => CFClient::Pickup::PU_FOOD],	1201	["Food" => PICKUP_FOOD],
967	["Drinks" => CFClient::Pickup::PU_DRINK],	1202	["Drinks" => PICKUP_DRINK],
968	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],	1203	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
969	["Keys" => CFClient::Pickup::PU_KEY],	1204	["Keys" => PICKUP_KEY],
970	["Magical Items" => CFClient::Pickup::PU_MAGICAL],	1205	["Magical Items" => PICKUP_MAGICAL],
971	["Potions" => CFClient::Pickup::PU_POTION],	1206	["Potions" => PICKUP_POTION],
972	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],	1207	["Magic Devices" => PICKUP_MAGIC_DEVICE],
973	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],	1208	["Ignore cursed" => PICKUP_NOT_CURSED],
974	["Jewelery" => CFClient::Pickup::PU_JEWELS],	1209	["Jewelery" => PICKUP_JEWELS],
975	],	1210	],
		1211	["Weight/Value ratio", 2, 17]
976	)	1212	)
977	{	1213	{
978	my ($title, $x, $y, @bits) = @$_;	1214	my ($title, $x, $y, @bits) = @$_;
979	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1215	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
980		1216
981	for (@bits) {	1217	for (@bits) {
982	++$y;	1218	++$y;
983		1219
984	my $mask = $_->[1];	1220	my $mask = $_->[1];
985	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1221	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
986	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1222	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
987	state => $CFG->{pickup} & $mask,	1223	state => $::CFG->{pickup} & $mask,
988	on_changed => sub {	1224	on_changed => sub {
989	my ($box, $value) = @_;	1225	my ($box, $value) = @_;
		1226
990	if ($value) {	1227	if ($value) {
991	$::CFG->{pickup} |= $mask;	1228	$::CFG->{pickup} |= $mask;
992	} else {	1229	} else {
993	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;	1230	$::CFG->{pickup} &= ~$mask;
994	}	1231	}
		1232
995	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})	1233	$::CONN->send_command ("pickup $::CFG->{pickup}")
996	if defined $::CONN;	1234	if defined $::CONN;
		1235
		1236	0
997	});	1237	});
		1238
		1239	${$_->[2]} = $checkbox if $_->[2];
998	}	1240	}
999	}	1241	}
1000		1242
		1243	$table->add (2, 18, new CFPlus::UI::ValSlider
		1244	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
		1245	template => ">= 99",
		1246	to_value => sub { ">= " . 5 * $_[0] },
		1247	on_changed => sub {
		1248	my ($slider, $value) = @_;
		1249
		1250	$::CFG->{pickup} &= ~0xF;
		1251	$::CFG->{pickup} |= int $value
		1252	if $value;
		1253	1;
		1254	});
		1255
		1256	$table->add (3, 18, new CFPlus::UI::Button
		1257	text => "set",
		1258	on_activate => sub {
		1259	$::CONN->send_command ("pickup $::CFG->{pickup}")
		1260	if defined $::CONN;
		1261	0
		1262	});
		1263
1001	$table	1264	$table
1002	}	1265	}
1003		1266
		1267	my %SORT_ORDER = (
		1268	type => undef,
		1269	mtime => sub {
		1270	my $NOW = time;
		1271	sort {
		1272	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1273	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1274
		1275	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1276	or $btime <=> $atime
		1277	or $a->{type} <=> $b->{type}
		1278	} @_
		1279	},
		1280	weight => sub { sort {
		1281	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1282	or $a->{type} <=> $b->{type}
		1283	} @_ },
		1284	);
		1285
1004	sub make_inventory_window {	1286	sub inventory_widget {
1005	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1287	my $hb = new CFPlus::UI::HBox homogeneous => 1;
		1288
		1289	$hb->add (my $vb1 = new CFPlus::UI::VBox);
		1290	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
		1291
		1292	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
		1293
		1294	use sort 'stable';
		1295
		1296	$hb1->add (new CFPlus::UI::Selector
		1297	value => $::CFG->{inv_sort},
		1298	options => [
		1299	[type => "Type/Name"],
		1300	[mtime => "Recent/Normal/Locked"],
		1301	[weight => "Weight/Type"],
		1302	],
		1303	on_changed => sub {
		1304	$::CFG->{inv_sort} = $_[1];
		1305	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1306	},
		1307	);
		1308	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
		1309	#TODO# update to weigh/maxweight
		1310	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
		1311
		1312	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1313	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1314	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
		1315
		1316	$hb->add (my $vb2 = new CFPlus::UI::VBox);
		1317
		1318	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
		1319
		1320	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1321	$sw2->add ($INVR = new CFPlus::UI::Inventory);
		1322
		1323	# XXX: Call after $INVR = ... because set_opencont sets the items
		1324	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
		1325
		1326	$hb
		1327	}
		1328
		1329	sub toggle_player_page {
		1330	my ($widget) = @_;
		1331
		1332	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
		1333	$PL_WINDOW->hide;
		1334	} else {
		1335	$PL_NOTEBOOK->set_current_page ($widget);
		1336	$PL_WINDOW->show;
		1337	}
		1338	}
		1339
		1340	sub player_window {
		1341	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1006	x => "center",	1342	x => "center",
1007	y => "center",	1343	y => "center",
1008	force_w => $WIDTH * 9/10,	1344	force_w => $WIDTH * 9/10,
1009	force_h => $HEIGHT * 9/10,	1345	force_h => $HEIGHT * 9/10,
1010	title => "Inventory",	1346	title => "Player",
		1347	name => "playerbook",
		1348	has_close_button => 1
1011	;	1349	;
1012		1350
1013	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1351	my $ntb =
		1352	$PL_NOTEBOOK =
		1353	new CFPlus::UI::Notebook expand => 1, debug => 1;
1014		1354
1015	$hb->add (my $vb1 = new CFClient::UI::VBox);	1355	$ntb->add (
1016	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1356	"Statistics (F2)" => $STATS_PAGE = stats_window,
1017	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1357	"Shows statistics, where all your Stats and Resistances are shown."
		1358	);
		1359	$ntb->add (
		1360	"Skills (F3)" => $SKILL_PAGE = skill_window,
		1361	"Shows all your Skills."
		1362	);
1018		1363
1019	$hb->add (my $vb2 = new CFClient::UI::VBox);	1364	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1365	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
		1366	$ntb->add (
		1367	"Spellbook (F4)" => $spellsw,
		1368	"Displays all spells you have and lets you edit keyboard shortcuts for them."
		1369	);
		1370	$ntb->add (
		1371	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
		1372	"Toggles the inventory window, where you can manage your loot (or treasures :). "
		1373	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
		1374	);
1020		1375
1021	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1376	$ntb->set_current_page ($INVENTORY_PAGE);
1022		1377
1023	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1378	$plwin->add ($ntb);
1024		1379	$plwin
1025	# XXX: Call after $INVR = ... because set_opencont sets the items
1026	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1027
1028	$invwin
1029	}	1380	}
1030		1381
1031	sub spell_setup {	1382	sub update_bindings {
1032	new CFClient::UI::SpellList	1383	$BIND_UPD_CB->() if $BIND_UPD_CB;
1033	}	1384	}
1034		1385
1035	sub keyboard_setup {	1386	sub keyboard_setup {
1036	my $binding_list = new CFClient::UI::VBox;	1387	my $binding_list = new CFPlus::UI::VBox;
1037		1388
1038	my $refresh;	1389	my $refresh;
1039	$refresh = sub {	1390	$refresh = $BIND_UPD_CB = sub {
1040	$binding_list->clear ();	1391	$binding_list->clear ();
1041		1392
		1393	return unless $PROFILE;
		1394
1042	for my $mod (keys %{$::CFG->{bindings}}) {	1395	for my $mod (keys %{$PROFILE->{bindings}}) {
1043	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1396	for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1044	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1397	my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1045	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1398	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1046		1399
1047	my $lbl = join "; ", @$cmds;	1400	my $lbl = join "; ", @$cmds;
1048	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1401	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1049	$binding_list->add (my $hb = new CFClient::UI::HBox);	1402	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1050	$hb->add (new CFClient::UI::Button	1403	$hb->add (new CFPlus::UI::Button
1051	text => "delete",	1404	text => "delete",
1052	tooltip => "Deletes the binding",	1405	tooltip => "Deletes the binding",
1053	on_activate => sub {	1406	on_activate => sub {
1054	$binding_list->remove ($hb);	1407	$binding_list->remove ($hb);
1055	delete $::CFG->{bindings}->{$mod}->{$sym};	1408	delete $PROFILE->{bindings}{$mod}{$sym};
		1409	0
1056	});	1410	});
1057		1411
1058	$hb->add (new CFClient::UI::Button	1412	$hb->add (new CFPlus::UI::Button
1059	text => "edit",	1413	text => "edit",
1060	tooltip => "Edits the binding",	1414	tooltip => "Edits the binding",
1061	on_activate => sub {	1415	on_activate => sub {
1062	$::BIND_EDITOR->set_binding (	1416	$::BIND_EDITOR->set_binding (
1063	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1417	$mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1064	sub {	1418	sub {
1065	my ($nmod, $nsym, $ncmds) = @_;	1419	my ($nmod, $nsym, $ncmds) = @_;
1066	delete $::CFG->{bindings}->{$mod}->{$sym};	1420	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1067	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1421	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1068	$refresh->();	1422	$refresh->();
1069	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1423	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1070	$SETUP_DIALOG->show;	1424	$SETUP_DIALOG->show;
1071	},	1425	},
1072	sub {	1426	sub {
1073	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1427	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1074	$SETUP_DIALOG->show;	1428	$SETUP_DIALOG->show;
1075	});	1429	});
1076	$::BIND_EDITOR->show;	1430	$::BIND_EDITOR->show;
1077	$SETUP_DIALOG->hide;	1431	$SETUP_DIALOG->hide;
		1432	0
1078	});	1433	});
1079		1434
1080	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1435	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1081	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1436	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1082	}	1437	}
1083	}	1438	}
1084	};	1439	};
1085		1440
1086	my $vb = new CFClient::UI::VBox;	1441	my $vb = new CFPlus::UI::VBox;
1087	$vb->add ($binding_list);	1442	$vb->add (new CFPlus::UI::FancyFrame
		1443	label => "Options",
		1444	child => (my $hb = new CFPlus::UI::HBox),
		1445	);
		1446	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
		1447	$hb->add (new CFPlus::UI::CheckBox
		1448	expand => 1,
		1449	state => $CFG->{shift_fire_stop},
		1450	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1451	on_changed => sub {
		1452	my ($cbox, $value) = @_;
		1453	$CFG->{shift_fire_stop} = $value;
		1454	0
		1455	});
		1456
		1457	$vb->add (new CFPlus::UI::FancyFrame
		1458	label => "Bindings",
		1459	child => $binding_list);
1088	$vb->add (my $hb = new CFClient::UI::HBox);	1460	$vb->add (my $hb = new CFPlus::UI::HBox);
1089		1461
1090	$hb->add (new CFClient::UI::Button	1462	$hb->add (new CFPlus::UI::Button
1091	text => "record new",	1463	text => "record new",
1092	expand => 1,	1464	expand => 1,
1093	tooltip => "This button opens the binding editor with an empty binding.",	1465	tooltip => "This button opens the binding editor with an empty binding.",
1094	on_activate => sub {	1466	on_activate => sub {
1095	$::BIND_EDITOR->set_binding (undef, undef, [],	1467	$::BIND_EDITOR->set_binding (undef, undef, [],
1096	sub {	1468	sub {
1097	my ($mod, $sym, $cmds) = @_;	1469	my ($mod, $sym, $cmds) = @_;
1098	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1470	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1099	$refresh->();	1471	$refresh->();
1100	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1472	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1101	$SETUP_DIALOG->show;	1473	$SETUP_DIALOG->show;
1102	},	1474	},
1103	sub {	1475	sub {
…		…
1105	$SETUP_DIALOG->show;	1477	$SETUP_DIALOG->show;
1106	},	1478	},
1107	);	1479	);
1108	$SETUP_DIALOG->hide;	1480	$SETUP_DIALOG->hide;
1109	$::BIND_EDITOR->show;	1481	$::BIND_EDITOR->show;
		1482	0
1110	},	1483	},
1111	);	1484	);
1112		1485
1113	$hb->add (new CFClient::UI::Button	1486	$hb->add (new CFPlus::UI::Button
1114	text => "close",	1487	text => "close",
1115	tooltip => "Closes the binding window",	1488	tooltip => "Closes the binding window",
1116	expand => 1,	1489	expand => 1,
1117	on_activate => sub {	1490	on_activate => sub {
1118	$SETUP_DIALOG->hide;	1491	$SETUP_DIALOG->hide;
		1492	0
1119	}	1493	}
1120	);	1494	);
1121		1495
1122	$refresh->();	1496	$refresh->();
1123		1497
1124	$vb	1498	$vb
1125	}	1499	}
1126		1500
1127	sub make_help_window {	1501	sub help_window {
1128	my $win = new CFClient::UI::FancyFrame	1502	my $win = new CFPlus::UI::Toplevel
1129	x => 'center',	1503	x => 'center',
1130	y => 'center',	1504	y => 'center',
1131	z => 2,	1505	z => 4,
1132	name => 'doc_browser',	1506	name => 'doc_browser',
1133	force_w => int $WIDTH * 7/8,	1507	force_w => int $WIDTH * 7/8,
1134	force_h => int $HEIGHT * 7/8,	1508	force_h => int $HEIGHT * 7/8,
1135	title => "Documentation";	1509	title => "Help Browser",
		1510	has_close_button => 1;
1136		1511
1137	$win->add (my $vbox = new CFClient::UI::VBox);	1512	$win->add (my $vbox = new CFPlus::UI::VBox);
1138		1513
1139	$vbox->add (my $buttons = new CFClient::UI::HBox);	1514	$vbox->add (new CFPlus::UI::FancyFrame
1140	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1515	label => "Navigation",
		1516	child => (my $buttons = new CFPlus::UI::HBox),
		1517	);
		1518	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1519	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1141		1520
1142	for (	1521	my @history;
1143	[intro => "Introduction"],	1522	my @future;
1144	[manual => "Manual"],	1523	my $curnode;
1145	[command_help => "Commands"],	1524
1146	[skill_help => "Skills"],	1525	my $load_node; $load_node = sub {
1147	) {
1148	my ($pod, $label) = @$_;	1526	my ($node, $para) = @_;
1149		1527
		1528	$buttons->clear;
		1529
1150	$buttons->add (new CFClient::UI::Button	1530	$buttons->add (new CFPlus::UI::Button
1151	text => $label,	1531	text => "⇤",
		1532	tooltip => "back to the starting page",
1152	on_activate => sub {	1533	on_activate => sub {
1153	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1534	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1154	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1535	unshift @future, @history;
1155		1536	@history = ();
1156	$viewer->clear;	1537	$load_node->(@{shift @future});
1157
1158	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159	for @$pom;
1160
1161	$viewer->set_offset (0);
1162	},	1538	},
1163	);	1539	);
		1540
		1541	if (@history) {
		1542	$buttons->add (new CFPlus::UI::Button
		1543	text => "⋘",
		1544	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1545	on_activate => sub {
		1546	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1547	$load_node->(@{pop @history});
		1548	},
		1549	);
		1550	}
		1551
		1552	if (@future) {
		1553	$buttons->add (new CFPlus::UI::Button
		1554	text => "⋙",
		1555	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1556	on_activate => sub {
		1557	push @history, [$curnode, $viewer->current_paragraph];
		1558	$load_node->(@{shift @future});
		1559	},
		1560	);
		1561	}
		1562
		1563	$buttons->add (new CFPlus::UI::Label text => " ");
		1564
		1565	my @path = CFPlus::Pod::full_path_of $node;
		1566	pop @path; # drop current node
		1567
		1568	for my $node (@path) {
		1569	$buttons->add (new CFPlus::UI::Button
		1570	text => $node->{kw}[0],
		1571	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1572	on_activate => sub {
		1573	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1574	$load_node->($node);
		1575	},
		1576	);
		1577	$buttons->add (new CFPlus::UI::Label text => "/");
		1578	}
		1579
		1580	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1581
		1582	$curnode = $node;
		1583
		1584	$viewer->clear;
		1585	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1586	$viewer->scroll_to ($para);
		1587	};
		1588
		1589	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1590
		1591	$CFPlus::Pod::goto_document = sub {
		1592	my (@path) = @_;
		1593
		1594	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1595
		1596	$load_node->((CFPlus::Pod::find @path)[0]);
		1597	$win->show;
		1598	};
		1599
		1600	$win
		1601	}
		1602
		1603	sub open_string_query {
		1604	my ($title, $cb, $txt, $tooltip) = @_;
		1605	my $dialog = new CFPlus::UI::Toplevel
		1606	x => "center",
		1607	y => "center",
		1608	z => 50,
		1609	force_w => $WIDTH * 4/5,
		1610	title => $title;
		1611
		1612	$dialog->add (
		1613	my $e = new CFPlus::UI::Entry
		1614	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1615	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1616	tooltip => $tooltip
		1617	);
		1618
		1619	$e->grab_focus;
		1620	$e->set_text ($txt) if $txt;
		1621	$dialog->show;
		1622	}
		1623
		1624	sub open_quit_dialog {
		1625	unless ($QUIT_DIALOG) {
		1626	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1627	x => "center",
		1628	y => "center",
		1629	z => 50,
		1630	title => "Really Quit?",
		1631	on_key_down => sub {
		1632	my ($dialog, $ev) = @_;
		1633	$ev->{sym} == 27 and $dialog->hide;
		1634	}
		1635	;
		1636
		1637	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1638
		1639	$vb->add (new CFPlus::UI::Label
		1640	text => "You should find a savebed and apply it first!",
		1641	max_w => $WIDTH * 0.25,
		1642	ellipsize => 0,
		1643	);
		1644	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1645	$hb->add (new CFPlus::UI::Button
		1646	text => "Ok",
		1647	expand => 1,
		1648	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1649	);
		1650	$hb->add (new CFPlus::UI::Button
		1651	text => "Quit anyway",
		1652	expand => 1,
		1653	on_activate => sub { exit },
		1654	);
1164	}	1655	}
1165		1656
1166	$viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");	1657	$QUIT_DIALOG->show;
		1658	$QUIT_DIALOG->grab_focus;
		1659	}
1167		1660
1168	$win	1661	sub show_tip_of_the_day {
		1662	# find all tips
		1663	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1664
		1665	my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
		1666	$todindex = 0 if $todindex >= @tod;
		1667	$CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
		1668
		1669	# create dialog
		1670	my $dialog;
		1671
		1672	my $close = sub {
		1673	$dialog->destroy;
		1674	};
		1675
		1676	$dialog = new CFPlus::UI::Toplevel
		1677	x => "center",
		1678	y => "center",
		1679	z => 3,
		1680	name => 'tip_of_the_day',
		1681	force_w => int $WIDTH * 4/9,
		1682	force_h => int $WIDTH * 2/9,
		1683	title => "Tip of the day #" . (1 + $todindex),
		1684	child => my $vbox = new CFPlus::UI::VBox,
		1685	has_close_button => 1,
		1686	on_delete => $close,
		1687	;
		1688
		1689	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1690	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1691	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1692
		1693	$vbox->add (my $table = new CFPlus::UI::Table);
		1694
		1695	$table->add (0, 0, new CFPlus::UI::Button
		1696	text => "Close",
		1697	tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
		1698	on_activate => $close,
		1699	);
		1700
		1701	$table->add (2, 0, new CFPlus::UI::Button
		1702	text => "Next",
		1703	tooltip => "Show the next <b>Tip of the day</b>.",
		1704	on_activate => sub {
		1705	$close->();
		1706	&show_tip_of_the_day;
		1707	},
		1708	);
		1709
		1710	$dialog->show;
1169	}	1711	}
1170		1712
1171	sub sdl_init {	1713	sub sdl_init {
1172	CFClient::SDL_Init	1714	CFPlus::SDL_Init
1173	and die "SDL::Init failed!\n";	1715	and die "SDL::Init failed!\n";
1174	}	1716	}
1175		1717
1176	sub video_init {	1718	sub video_init {
1177	sdl_init;	1719	sdl_init;
…		…
1182		1724
1183	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1725	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1184	$FULLSCREEN = $CFG->{fullscreen};	1726	$FULLSCREEN = $CFG->{fullscreen};
1185	$FAST = $CFG->{fast};	1727	$FAST = $CFG->{fast};
1186		1728
1187	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1729	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1188	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1730	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1189		1731
1190	$SDL_ACTIVE = 1;	1732	$SDL_ACTIVE = 1;
1191	$LAST_REFRESH = time - 0.01;	1733	$LAST_REFRESH = time - 0.01;
1192		1734
1193	CFClient::OpenGL::init;	1735	CFPlus::OpenGL::init;
1194		1736
1195	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1737	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1196		1738
1197	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1739	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1198		1740
1199	#############################################################################	1741	#############################################################################
1200		1742
1201	if ($DEBUG_STATUS) {	1743	if ($DEBUG_STATUS) {
1202	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1744	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1203	} else {	1745	} else {
1204	# create the widgets	1746	# create the widgets
1205		1747
1206	$DEBUG_STATUS = new CFClient::UI::Label	1748	$DEBUG_STATUS = new CFPlus::UI::Label
1207	padding => 0,	1749	padding => 0,
1208	z => 100,	1750	z => 100,
1209	force_x => "max",	1751	force_x => "max",
1210	force_y => 0;	1752	force_y => 0;
1211	$DEBUG_STATUS->show;	1753	$DEBUG_STATUS->show;
1212		1754
1213	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1755	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1214		1756
1215	$STATUSBOX = new CFClient::UI::Statusbox;	1757	$STATUSBOX = new CFPlus::UI::Statusbox;
1216	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1758	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1217		1759
1218	(new CFClient::UI::Frame	1760	(new CFPlus::UI::Frame
1219	bg => [0, 0, 0, 0.4],	1761	bg => [0, 0, 0, 0.4],
1220	force_x => 0,	1762	force_x => 0,
1221	force_y => "max",	1763	force_y => "max",
1222	child => $STATUSBOX,	1764	child => $STATUSBOX,
1223	)->show;	1765	)->show;
1224		1766
1225	CFClient::UI::FancyFrame->new (	1767	CFPlus::UI::Toplevel->new (
1226	title => "Map",	1768	title => "Map",
1227	name => "mapmap",	1769	name => "mapmap",
1228	x => 0,	1770	x => 0,
1229	y => $FONTSIZE + 8,	1771	y => $FONTSIZE + 8,
1230	border_bg => [1, 1, 1, 192/255],	1772	border_bg => [1, 1, 1, 192/255],
1231	bg => [1, 1, 1, 0],	1773	bg => [1, 1, 1, 0],
1232	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1774	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1233	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1775	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1234	),	1776	),
1235	)->show;	1777	)->show;
1236		1778
1237	$MAPWIDGET = new CFClient::MapWidget;	1779	$MAPWIDGET = new CFPlus::MapWidget;
1238	$MAPWIDGET->connect (activate_console => sub {	1780	$MAPWIDGET->connect (activate_console => sub {
1239	my ($mapwidget, $preset) = @_;	1781	my ($mapwidget, $preset) = @_;
1240		1782
1241	if ($CONSOLE) {	1783	if ($CONSOLE) {
1242	$CONSOLE->{input}->{auto_activated} = 1;	1784	$CONSOLE->{input}->{auto_activated} = 1;
1243	$CONSOLE->{input}->focus_in;	1785	$CONSOLE->{input}->grab_focus;
1244		1786
1245	if ($preset && $CONSOLE->{input}->get_text eq '') {	1787	if ($preset && $CONSOLE->{input}->get_text eq '') {
1246	$CONSOLE->{input}->set_text ($preset);	1788	$CONSOLE->{input}->set_text ($preset);
1247	}	1789	}
1248	}	1790	}
1249	});	1791	});
1250	$MAPWIDGET->show;	1792	$MAPWIDGET->show;
1251	$MAPWIDGET->focus_in;	1793	$MAPWIDGET->grab_focus;
1252		1794
1253	$LOGVIEW = new CFClient::UI::TextView	1795	$LOGVIEW = new CFPlus::UI::TextScroller
1254	expand => 1,	1796	expand => 1,
1255	font => $FONT_FIXED,	1797	font => $FONT_FIXED,
1256	fontsize => $::CFG->{log_fontsize},	1798	fontsize => $::CFG->{log_fontsize},
		1799	indent => -4,
1257	can_hover => 1,	1800	can_hover => 1,
1258	can_events => 1,	1801	can_events => 1,
1259	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1802	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260	;	1803	;
1261		1804
1262	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1805	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1263	title => "Setup",	1806	title => "Setup",
1264	name => "setup_dialog",	1807	name => "setup_dialog",
1265	x => 'center',	1808	x => 'center',
1266	y => 'center',	1809	y => 'center',
1267	z => 2,	1810	z => 2,
1268	force_w => $::WIDTH * 0.6,	1811	force_w => $::WIDTH * 0.6,
1269	force_h => $::HEIGHT * 0.6,	1812	force_h => $::HEIGHT * 0.6,
		1813	has_close_button => 1,
1270	;	1814	;
1271		1815
		1816	$METASERVER = metaserver_dialog;
		1817
1272	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1818	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1273	filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);	1819	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1274		1820
1275	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1821	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276	"Configure the server to play on, your username, password and other server-related options.");	1822	"Configure the server to play on, your username, password and other server-related options.");
1277	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1823	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278	"Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");	1824	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1279	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1825	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1280	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1826	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1281	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1827	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1282	"Configure the use of audio, sound effects and background music.");	1828	"Configure the use of audio, sound effects and background music.");
1283	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1829	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1284	"Lets you define, edit and delete bindings."	1830	"Lets you define, edit and delete key bindings."
1285	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1831	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1286	. "with nothing set and the recording started. After doing the actions you "	1832	. "with nothing set and the recording started. After doing the actions you "
1287	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1833	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1288	. "After pressing the combo the binding will be saved automatically and the "	1834	. "After pressing the combo the binding will be saved automatically and the "
1289	. "binding editor closes");	1835	. "binding editor closes");
1290	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1836	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1291	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1837	"Some debuggin' options. Do not ask.");
1292		1838
1293	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1839	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1294		1840
1295	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1841	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1296	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1842	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1297		1843
1298	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1844	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1299	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1845	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1300		1846
1301	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	1847	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
1302		1848
1303	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1304	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1305	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1849	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1306	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1850	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1307	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1308		1851
1309	$BUTTONBAR->add (new CFClient::UI::Button	1852	$BUTTONBAR->add (new CFPlus::UI::Button
1310	text => "Save Config",	1853	text => "Save Config",
1311	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1854	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1312	on_activate => sub {	1855	on_activate => sub {
1313	$::CFG->{layout} = CFClient::UI::get_layout;	1856	$::CFG->{layout} = CFPlus::UI::get_layout;
1314	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1857	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1315	status "Configuration Saved";	1858	status "Configuration Saved";
		1859	0
1316	},	1860	},
1317	);	1861	);
1318		1862
1319	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1863	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1320	tooltip => "View Documentation");	1864	tooltip => "View Documentation");
1321		1865
1322	$BUTTONBAR->add (new CFClient::UI::Button	1866	$BUTTONBAR->add (new CFPlus::UI::Button
1323	text => "Quit",	1867	text => "Quit",
1324	tooltip => "Terminates the program",	1868	tooltip => "Terminates the program",
1325	on_activate => sub {	1869	on_activate => sub {
1326	if ($CONN) {	1870	if ($CONN) {
1327	open_quit_dialog;	1871	open_quit_dialog;
1328	} else {	1872	} else {
1329	exit;	1873	exit;
1330	}	1874	}
		1875	0
1331	},	1876	},
1332	);	1877	);
1333		1878
1334	$BUTTONBAR->show;	1879	$BUTTONBAR->show;
1335	$SETUP_DIALOG->show;	1880	$SETUP_DIALOG->show;
…		…
1337		1882
1338	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1883	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1339	}	1884	}
1340		1885
1341	sub video_shutdown {	1886	sub video_shutdown {
		1887	CFPlus::OpenGL::shutdown;
		1888
1342	undef $SDL_ACTIVE;	1889	undef $SDL_ACTIVE;
1343	}	1890	}
1344		1891
1345	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1892	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1346	my $bgmusic;#TODO#hack#d#	1893	my $bgmusic;#TODO#hack#d#
…		…
1353		1900
1354	sub audio_music_finished {	1901	sub audio_music_finished {
1355	return unless $CFG->{bgm_enable};	1902	return unless $CFG->{bgm_enable};
1356		1903
1357	# TODO: hack, do play loop and mood music	1904	# TODO: hack, do play loop and mood music
1358	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1905	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1359	$bgmusic->play (0);	1906	$bgmusic->play (0);
1360		1907
1361	push @bgmusic, shift @bgmusic;	1908	push @bgmusic, shift @bgmusic;
1362	}	1909	}
1363		1910
1364	sub audio_init {	1911	sub audio_init {
1365	if ($CFG->{audio_enable}) {	1912	if ($CFG->{audio_enable}) {
1366	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1913	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1367	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1914	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1368		1915
1369	unless ($SDL_MIXER) {	1916	unless ($SDL_MIXER) {
1370	status "Unable to open sound device: there will be no sound";	1917	status "Unable to open sound device: there will be no sound";
1371	return;	1918	return;
1372	}	1919	}
1373		1920
1374	CFClient::Mix_AllocateChannels 8;	1921	CFPlus::Mix_AllocateChannels 8;
1375	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1922	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1376		1923
1377	audio_music_finished;	1924	audio_music_finished;
1378		1925
		1926	local $_;
1379	while (<$fh>) {	1927	while (<$fh>) {
1380	next if /^\s*#/;	1928	next if /^\s*#/;
1381	next if /^\s*$/;	1929	next if /^\s*$/;
1382		1930
1383	my ($file, $volume, $event) = split /\s+/, $_, 3;	1931	my ($file, $volume, $event) = split /\s+/, $_, 3;
1384		1932
1385	push @SOUNDS, "$volume,$file";	1933	push @SOUNDS, "$volume,$file";
1386		1934
1387	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1935	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1388	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1936	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1389	$chunk->volume ($volume * 128 / 100);	1937	$chunk->volume ($volume * 128 / 100);
1390	$chunk	1938	$chunk
1391	};	1939	};
1392	}	1940	}
1393	} else {	1941	} else {
…		…
1395	}	1943	}
1396	}	1944	}
1397	}	1945	}
1398		1946
1399	sub audio_shutdown {	1947	sub audio_shutdown {
1400	CFClient::Mix_CloseAudio if $SDL_MIXER;	1948	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1401	undef $SDL_MIXER;	1949	undef $SDL_MIXER;
1402	@SOUNDS = ();	1950	@SOUNDS = ();
1403	%AUDIO_CHUNKS = ();	1951	%AUDIO_CHUNKS = ();
1404	}	1952	}
1405		1953
…		…
1412		1960
1413	sub force_refresh {	1961	sub force_refresh {
1414	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	1962	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1415	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1963	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1416		1964
1417	$CFClient::UI::ROOT->draw;	1965	$CFPlus::UI::ROOT->draw;
1418		1966
1419	$WANT_REFRESH = 0;	1967	$WANT_REFRESH = 0;
1420	$CAN_REFRESH = 0;	1968	$CAN_REFRESH = 0;
1421	$LAST_REFRESH = $NOW;	1969	$LAST_REFRESH = $NOW;
1422		1970
1423	0 && do {
1424	# some weird model-drawing code, just a joke right now
1425	use CFClient::OpenGL;
1426
1427	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1428	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1429	$demo{r} ||= do {
1430	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1431	$mod->{v} = pack "f*", @{$mod->{v}};
1432	$_ = [scalar @$_, pack "S!*", @$_]
1433	for values %{$mod->{g}};
1434	$mod
1435	};
1436
1437	my $r = $demo{r} or die;
1438
1439	glDepthMask 1;
1440	glClear GL_DEPTH_BUFFER_BIT;
1441	glEnable GL_TEXTURE_2D;
1442	glEnable GL_DEPTH_TEST;
1443	glEnable GL_CULL_FACE;
1444	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1445
1446	glMatrixMode GL_PROJECTION;
1447	glLoadIdentity;
1448	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1449	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1450	glMatrixMode GL_MODELVIEW;
1451	glLoadIdentity;
1452
1453	glPushMatrix;
1454	glTranslate 0, 0, -800;
1455	glScale 1, -1, 1;
1456	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1457	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1458	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1459	glScale 50, 50, 50;
1460
1461	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1462	while (my ($k, $v) = each %{$r->{g}}) {
1463	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1464	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1465	}
1466
1467	glPopMatrix;
1468
1469	glShadeModel GL_FLAT;
1470	glDisable GL_DEPTH_TEST;
1471	glDisable GL_TEXTURE_2D;
1472	glDepthMask 0;
1473
1474	$WANT_REFRESH++;
1475	};
1476
1477	CFClient::SDL_GL_SwapBuffers;	1971	CFPlus::SDL_GL_SwapBuffers;
1478	}	1972	}
1479		1973
1480	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1974	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1481	$NOW = time;	1975	$NOW = time;
1482		1976
1483	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1977	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1484	for CFClient::SDL_PollEvent;	1978	for CFPlus::SDL_PollEvent;
1485		1979
1486	if (%animate_object) {	1980	if (%animate_object) {
1487	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1981	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1488	$WANT_REFRESH++;	1982	$WANT_REFRESH++;
1489	}	1983	}
…		…
1513	$CONN->face_prefetch	2007	$CONN->face_prefetch
1514	if $CONN;	2008	if $CONN;
1515	});	2009	});
1516		2010
1517	%SDL_CB = (	2011	%SDL_CB = (
1518	CFClient::SDL_QUIT => sub {	2012	CFPlus::SDL_QUIT => sub {
1519	Event::unloop -1;	2013	Event::unloop -1;
1520	},	2014	},
1521	CFClient::SDL_VIDEORESIZE => sub {	2015	CFPlus::SDL_VIDEORESIZE => sub {
1522	},	2016	},
1523	CFClient::SDL_VIDEOEXPOSE => sub {	2017	CFPlus::SDL_VIDEOEXPOSE => sub {
1524	CFClient::UI::full_refresh;	2018	CFPlus::UI::full_refresh;
1525	},	2019	},
1526	CFClient::SDL_ACTIVEEVENT => sub {	2020	CFPlus::SDL_ACTIVEEVENT => sub {
1527	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2021	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1528	},	2022	},
1529	CFClient::SDL_KEYDOWN => sub {	2023	CFPlus::SDL_KEYDOWN => sub {
1530	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2024	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1531	# alt-enter	2025	# alt-enter
		2026	$FULLSCREEN_ENABLE->toggle;
1532	video_shutdown;	2027	video_shutdown;
1533	$CFG->{fullscreen} = !$CFG->{fullscreen};
1534	video_init;	2028	video_init;
1535	} else {	2029	} else {
1536	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2030	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1537	}	2031	}
1538	},	2032	},
1539	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2033	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1540	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2034	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1541	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2035	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1542	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2036	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1543	CFClient::SDL_USEREVENT => sub {	2037	CFPlus::SDL_USEREVENT => sub {
1544	if ($_[0]{code} == 1) {	2038	if ($_[0]{code} == 1) {
1545	audio_channel_finished $_[0]{data1};	2039	audio_channel_finished $_[0]{data1};
1546	} elsif ($_[0]{code} == 0) {	2040	} elsif ($_[0]{code} == 0) {
1547	audio_music_finished;	2041	audio_music_finished;
1548	}	2042	}
…		…
1552	#############################################################################	2046	#############################################################################
1553		2047
1554	$SIG{INT} = $SIG{TERM} = sub { exit };	2048	$SIG{INT} = $SIG{TERM} = sub { exit };
1555		2049
1556	{	2050	{
1557	local $SIG{__DIE__} = sub {
1558	return unless defined $^S && !$^S;
1559	Carp::confess $_[1];#d#TODO: remove when stable
1560	CFClient::fatal $_[0];
1561	};
1562
1563	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2051	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1564	CFClient::UI::set_layout ($::CFG->{layout});	2052	CFPlus::UI::set_layout ($::CFG->{layout});
1565		2053
1566	my %DEF_CFG = (	2054	my %DEF_CFG = (
1567	sdl_mode => 0,	2055	sdl_mode => 0,
1568	width => 640,	2056	width => 640,
1569	height => 480,	2057	height => 480,
1570	fullscreen => 0,	2058	fullscreen => 0,
1571	fast => 0,	2059	fast => 0,
1572	map_scale => 1,	2060	map_scale => 1,
1573	fow_enable => 1,	2061	fow_enable => 1,
1574	fow_intensity => 0.45,	2062	fow_intensity => 0.45,
1575	fow_smooth => 0,	2063	fow_smooth => 0,
1576	gui_fontsize => 1,	2064	gui_fontsize => 1,
1577	log_fontsize => 1,	2065	log_fontsize => 0.7,
1578	gauge_fontsize=> 1,	2066	gauge_fontsize => 1,
1579	gauge_size => 0.35,	2067	gauge_size => 0.35,
1580	stat_fontsize => 1,	2068	stat_fontsize => 0.7,
1581	mapsize => 100,	2069	mapsize => 100,
1582	host => "crossfire.schmorp.de",
1583	say_command => 'say',	2070	say_command => 'chat',
1584	audio_enable => 1,	2071	audio_enable => 1,
1585	bgm_enable => 1,	2072	bgm_enable => 1,
1586	bgm_volume => 0.25,	2073	bgm_volume => 0.25,
1587	face_prefetch => 0,	2074	face_prefetch => 0,
1588	output_sync => 1,	2075	output_sync => 1,
1589	output_count => 1,	2076	output_count => 1,
		2077	pickup => 0,
		2078	inv_sort => "mtime",
		2079	default => "profile", # default profile
		2080	show_tips => 1,
		2081	);
1590	);	2082
1591
1592	while (my ($k, $v) = each %DEF_CFG) {	2083	while (my ($k, $v) = each %DEF_CFG) {
1593	$CFG->{$k} = $v unless exists $CFG->{$k};	2084	$CFG->{$k} = $v unless exists $CFG->{$k};
1594	}	2085	}
1595		2086
		2087	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2088
1596	sdl_init;	2089	sdl_init;
1597		2090
1598	@SDL_MODES = reverse	2091	@SDL_MODES = reverse
1599	grep $_->[0] >= 640 && $_->[1] >= 480,	2092	grep $_->[0] >= 640 && $_->[1] >= 480,
1600	CFClient::SDL_ListModes;	2093	CFPlus::SDL_ListModes;
1601		2094
1602	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2095	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1603		2096
1604	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2097	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1605		2098
1606	{	2099	{
1607	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2100	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1608	DejaVuSans.ttf	2101	DejaVuSans.ttf
1609	DejaVuSansMono.ttf	2102	DejaVuSansMono.ttf
1610	DejaVuSans-Bold.ttf	2103	DejaVuSans-Bold.ttf
1611	DejaVuSansMono-Bold.ttf	2104	DejaVuSansMono-Bold.ttf
1612	DejaVuSans-Oblique.ttf	2105	DejaVuSans-Oblique.ttf
1613	DejaVuSansMono-Oblique.ttf	2106	DejaVuSansMono-Oblique.ttf
1614	DejaVuSans-BoldOblique.ttf	2107	DejaVuSans-BoldOblique.ttf
1615	DejaVuSansMono-BoldOblique.ttf	2108	DejaVuSansMono-BoldOblique.ttf
1616	);	2109	);
1617		2110
1618	CFClient::add_font $_ for @fonts;	2111	CFPlus::add_font $_ for @fonts;
1619		2112
1620	CFClient::pango_init;	2113	CFPlus::pango_init;
1621		2114
1622	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2115	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1623	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2116	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1624		2117
1625	$FONT_PROP->make_default;	2118	$FONT_PROP->make_default;
1626	}	2119	}
1627		2120
1628	# compare mono (ft) vs. rgba (cairo)	2121	# compare mono (ft) vs. rgba (cairo)
1629	# ft - 1.8s, cairo 3s, even in alpha-only mode	2122	# ft - 1.8s, cairo 3s, even in alpha-only mode
1630	# for my $rgba (0..1) {	2123	# for my $rgba (0..1) {
1631	# my $t1 = Time::HiRes::time;	2124	# my $t1 = Time::HiRes::time;
1632	# for (1..1000) {	2125	# for (1..1000) {
1633	# my $layout = CFClient::Layout->new ($rgba);	2126	# my $layout = CFPlus::Layout->new ($rgba);
1634	# $layout->set_text ("hallo" x 100);	2127	# $layout->set_text ("hallo" x 100);
1635	# $layout->render;	2128	# $layout->render;
1636	# }	2129	# }
1637	# my $t2 = Time::HiRes::time;	2130	# my $t2 = Time::HiRes::time;
1638	# warn $t2-$t1;	2131	# warn $t2-$t1;
1639	# }	2132	# }
1640		2133
		2134	$startup_done->();
		2135
1641	video_init;	2136	video_init;
1642	audio_init;	2137	audio_init;
1643	}	2138	}
1644		2139
		2140	show_tip_of_the_day if $CFG->{show_tips};
		2141
1645	Event::loop;	2142	Event::loop;
		2143	#CFPlus::SDL_Quit;
		2144	#CFPlus::_exit 0;
1646		2145
1647	END { CFClient::SDL_Quit }	2146	END { CFPlus::SDL_Quit }
1648		2147
1649	=head1 NAME	2148	=head1 NAME
1650		2149
1651	cfplus - A Crossfire+ and Crossfire game client	2150	cfplus - A Crossfire+ and Crossfire game client
1652		2151

Diff Legend

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