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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.153 by root, Tue Apr 24 01:13:54 2007 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;
		26
		27	use Carp 'verbose';
5		28
6	# do things only needed for single-binary version (par)	29	# do things only needed for single-binary version (par)
7	BEGIN {	30	BEGIN {
8	if (%PAR::LibCache) {	31	if (%PAR::LibCache) {
9	@INC = grep ref, @INC; # weed out all paths except pars loader refs	32	@INC = grep ref, @INC; # weed out all paths except pars loader refs
10		33
11	while (my ($filename, $zip) = each %PAR::LibCache) {	34	while (my ($filename, $zip) = each %PAR::LibCache) {
12	for ($zip->memberNames) {	35	for ($zip->memberNames) {
13	next unless /^\/root\/(.*)/;	36	next unless /^root\/(.*)/;
14	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	37	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15	unless -e "$ENV{PAR_TEMP}/$1";	38	unless -e "$ENV{PAR_TEMP}/$1";
16	}	39	}
17	}	40	}
18		41
…		…
32	use Crossfire;	55	use Crossfire;
33	use Crossfire::Protocol::Constants;	56	use Crossfire::Protocol::Constants;
34		57
35	use Compress::LZF;	58	use Compress::LZF;
36		59
37	use CFClient;	60	use CFPlus;
38	use CFClient::OpenGL ();	61	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	62	use CFPlus::Protocol;
		63	use CFPlus::DB;
40	use CFClient::UI;	64	use CFPlus::UI;
		65	use CFPlus::UI::Inventory;
		66	use CFPlus::UI::SpellList;
41	use CFClient::Pod;	67	use CFPlus::Pod;
42	use CFClient::BindingEditor;
43	use CFClient::MapWidget;	68	use CFPlus::MapWidget;
		69	use CFPlus::Macro;
44		70
45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	71	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46	$SIG{PIPE} = 'IGNORE';	72	$SIG{PIPE} = 'IGNORE';
47		73
		74	$Event::Eval = 1;
48	$Event::DIED = sub {	75	$Event::DIED = sub {
49	# TODO: display dialog box or so	76	CFPlus::fatal Carp::longmess $_[1]
50	Carp::confess $_[1];#d#TODO: remove when stable
51	CFClient::error $_[1];
52	};	77	};
53
54	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
55
56	our $VERSION = '0.1';
57		78
58	my $MAX_FPS = 60;	79	my $MAX_FPS = 60;
59	my $MIN_FPS = 5; # unused as of yet	80	my $MIN_FPS = 5; # unused as of yet
60		81
61	our $META_SERVER = "crossfire.real-time.com:13326";	82	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
62		83
63	our $LAST_REFRESH;	84	our $LAST_REFRESH;
64	our $NOW;	85	our $NOW;
65		86
66	our $CFG;	87	our $CFG;
67	our $CONN;	88	our $CONN;
		89	our $PROFILE; # current profile
68	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	90	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
69		91
70	our $WANT_REFRESH;	92	our $WANT_REFRESH;
71	our $CAN_REFRESH;	93	our $CAN_REFRESH;
72		94
…		…
103		125
104	our $INVENTORY_PAGE;	126	our $INVENTORY_PAGE;
105	our $STATS_PAGE;	127	our $STATS_PAGE;
106	our $SKILL_PAGE;	128	our $SKILL_PAGE;
107	our $SPELL_PAGE;	129	our $SPELL_PAGE;
		130	our $SPELL_LIST;
108		131
109	our $HELP_WINDOW;	132	our $HELP_WINDOW;
110	our $MESSAGE_WINDOW;	133	our $MESSAGE_WINDOW;
111	our $FLOORBOX;	134	our $FLOORBOX;
112	our $GAUGES;	135	our $GAUGES;
…		…
125		148
126	our $INV;	149	our $INV;
127	our $INVR;	150	our $INVR;
128	our $INV_RIGHT_HB;	151	our $INV_RIGHT_HB;
129		152
130	our $BIND_EDITOR;
131	our $BIND_UPD_CB;
132
133	our $PICKUP_CFG;	153	our $PICKUP_CFG;
134		154
		155	our $IN_BUILD_MODE;
		156	our $BUILD_BUTTON;
		157
135	sub status {	158	sub status {
136	$STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	159	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
137	}	160	}
138		161
139	sub debug {	162	sub debug {
140	$DEBUG_STATUS->set_text ($_[0]);	163	$DEBUG_STATUS->set_text ($_[0]);
		164	}
		165
		166	sub message {
		167	my ($para) = @_;
		168
		169	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		170
		171	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
		172
		173	$LOGVIEW->add_paragraph ($para);
		174	$LOGVIEW->scroll_to_bottom;
141	}	175	}
142		176
143	sub destroy_query_dialog {	177	sub destroy_query_dialog {
144	(delete $_[0]{query_dialog})->destroy	178	(delete $_[0]{query_dialog})->destroy
145	if $_[0]{query_dialog};	179	if $_[0]{query_dialog};
146	}	180	}
147		181
		182	# FIXME: a very ugly hack to wait for stat update look below! #d#
		183	our $QUERY_TIMER; #d#
		184
148	# server query dialog	185	# server query dialog
149	sub server_query {	186	sub server_query {
150	my ($conn, $flags, $prompt) = @_;	187	my ($conn, $flags, $prompt) = @_;
151		188
		189	# FIXME: a very ugly hack to wait for stat update #d#
		190	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
		191	unless ($QUERY_TIMER) {
		192	$QUERY_TIMER =
		193	Event->timer (
		194	after => 1,
		195	cb => sub {
		196	server_query ($conn, $flags, $prompt, 1);
		197	$QUERY_TIMER = undef
		198	}
		199	);
		200	return;
		201	}
		202	}
		203
152	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	204	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
153	x => "center",	205	x => "center",
154	y => "center",	206	y => "center",
155	title => "Server Query",	207	title => "Server Query",
156	child => my $vbox = new CFClient::UI::VBox,	208	child => my $vbox = new CFPlus::UI::VBox,
157	;	209	;
158		210
159	my @dialog = my $label = new CFClient::UI::Label	211	my @dialog = my $label = new CFPlus::UI::Label
160	max_w => $::WIDTH * 0.4,	212	max_w => $::WIDTH * 0.8,
161	ellipsise => 0,	213	ellipsise => 0,
162	text => $prompt;	214	text => $prompt;
163		215
164	if ($flags & CS_QUERY_YESNO) {	216	if ($flags & CS_QUERY_YESNO) {
165	push @dialog, my $hbox = new CFClient::UI::HBox;	217	push @dialog, my $hbox = new CFPlus::UI::HBox;
166		218
167	$hbox->add (new CFClient::UI::Button	219	$hbox->add (new CFPlus::UI::Button
168	text => "No",	220	text => "No",
169	on_activate => sub {	221	on_activate => sub {
170	$conn->send ("reply n");	222	$conn->send ("reply n");
171	$dialog->destroy;	223	$dialog->destroy;
172	0	224	0
173	}	225	}
174	);	226	);
175	$hbox->add (new CFClient::UI::Button	227	$hbox->add (new CFPlus::UI::Button
176	text => "Yes",	228	text => "Yes",
177	on_activate => sub {	229	on_activate => sub {
178	$conn->send ("reply y");	230	$conn->send ("reply y");
179	destroy_query_dialog $conn;	231	destroy_query_dialog $conn;
180	0	232	0
…		…
182	);	234	);
183		235
184	$dialog->grab_focus;	236	$dialog->grab_focus;
185		237
186	} elsif ($flags & CS_QUERY_SINGLECHAR) {	238	} elsif ($flags & CS_QUERY_SINGLECHAR) {
187	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
188
189	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	239	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
190	$MESSAGE_WINDOW->show;	240	$dialog->{tooltip} = "#charcreation_focus";
191		241
192	unshift @dialog, new CFClient::UI::Label	242	unshift @dialog, new CFPlus::UI::Label
193	max_w => $::WIDTH * 0.4,	243	max_w => $::WIDTH * 0.8,
194	ellipsise => 0,	244	ellipsise => 0,
195	markup => "\nOr use your keyboard and the text entry below:\n";	245	markup => "\nOr use your keyboard and the text entry below:\n";
196		246
197	unshift @dialog, my $table = new CFClient::UI::Table;	247	unshift @dialog, my $table = new CFPlus::UI::Table;
198		248
199	$table->add (0, 0, new CFClient::UI::Button	249	$table->add (0, 0, new CFPlus::UI::Button
200	text => "Next Race",	250	text => "Next Race",
201	on_activate => sub {	251	on_activate => sub {
202	$conn->send ("reply n");	252	$conn->send ("reply n");
203	destroy_query_dialog $conn;	253	destroy_query_dialog $conn;
204	0	254	0
205	},	255	},
206	);	256	);
207	$table->add (2, 0, new CFClient::UI::Button	257	$table->add (2, 0, new CFPlus::UI::Button
208	text => "Accept",	258	text => "Accept",
209	on_activate => sub {	259	on_activate => sub {
210	$conn->send ("reply d");	260	$conn->send ("reply d");
211	destroy_query_dialog $conn;	261	destroy_query_dialog $conn;
212	0	262	0
213	},	263	},
214	);	264	);
215		265
		266	if ($conn->{chargen_race_description}) {
		267	unshift @dialog, new CFPlus::UI::Label
		268	max_w => $::WIDTH * 0.8,
		269	ellipsise => 0,
		270	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
		271	;
		272	}
		273
		274	unshift @dialog, new CFPlus::UI::Face
		275	face => $conn->{player}{face},
		276	bg => [.2, .2, .2, 1],
		277	min_w => 64,
		278	min_h => 64,
		279	;
		280
		281	if ($conn->{chargen_race_title}) {
		282	unshift @dialog, new CFPlus::UI::Label
		283	allign => 1,
		284	ellipsise => 0,
		285	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
		286	;
		287	}
		288
216	unshift @dialog, new CFClient::UI::Label	289	unshift @dialog, new CFPlus::UI::Label
217	max_w => $::WIDTH * 0.4,	290	max_w => $::WIDTH * 0.4,
218	ellipsise => 0,	291	ellipsise => 0,
219	markup =>	292	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
220	"<big><b>Character Creation: Race</b></big>\n\n"
221	. "Look at the <b>Messages</b> window to see a description of this race "
222	. "and the center of the screen to see how this race looks like "
223	. "(<small>below this dialog window: you may need to move the dialog away and "
224	. "click into the display area to make it visible</small>).\n\n"
225	. "You can look at another race, or accept this race (you will cycle back to "
226	. "this race eventually, so you can take your time making this important choice."
227	;	293	;
228		294
229	} elsif ($prompt =~ /roll new stats/) {	295	} elsif ($prompt =~ /roll new stats/) {
230	if (my $stat = delete $conn->{stat_change_with}) {	296	if (my $stat = delete $conn->{stat_change_with}) {
231	$conn->send ("reply $stat");	297	$conn->send ("reply $stat");
…		…
234	}	300	}
235		301
236	$STATS_PAGE->show;	302	$STATS_PAGE->show;
237	$MESSAGE_WINDOW->hide;	303	$MESSAGE_WINDOW->hide;
238		304
239	unshift @dialog, new CFClient::UI::Label	305	unshift @dialog, new CFPlus::UI::Label
240	max_w => $::WIDTH * 0.4,	306	max_w => $::WIDTH * 0.4,
241	ellipsise => 0,	307	ellipsise => 0,
242	markup => "\nOr use your keyboard and the text entry below:\n";	308	markup => "\nOr use your keyboard and the text entry below:\n";
243		309
244	unshift @dialog, my $table = new CFClient::UI::Table;	310	unshift @dialog, my $table = new CFPlus::UI::Table;
245		311
246	# left: re-roll	312	# left: re-roll
247	$table->add (0, 0, new CFClient::UI::Button	313	$table->add (0, 0, new CFPlus::UI::Button
248	text => "Roll Again",	314	text => "Roll Again",
249	on_activate => sub {	315	on_activate => sub {
250	$conn->send ("reply y");	316	$conn->send ("reply y");
251	destroy_query_dialog $conn;	317	destroy_query_dialog $conn;
252	0	318	0
253	},	319	},
254	);	320	);
255		321
256	# center: swap stats	322	# center: swap stats
257	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	323	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
258	expand => 1,	324	expand => 1,
259	value => $_,	325	value => $_,
260	options => [	326	options => [
261	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	327	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
262	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	328	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
…		…
266	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	332	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
267	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	333	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
268	],	334	],
269	), 1 .. 2;	335	), 1 .. 2;
270		336
271	$table->add (2, 0, new CFClient::UI::Button	337	$table->add (2, 0, new CFPlus::UI::Button
272	text => "Swap Stats",	338	text => "Swap Stats",
273	on_activate => sub {	339	on_activate => sub {
274	$conn->{stat_change_with} = $sw2->{value};	340	$conn->{stat_change_with} = $sw2->{value};
275	$conn->send ("reply $sw1->{value}");	341	$conn->send ("reply $sw1->{value}");
276	destroy_query_dialog $conn;	342	destroy_query_dialog $conn;
277	0	343	0
278	},	344	},
279	);	345	);
280	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	346	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
281		347
282	# right: accept	348	# right: accept
283	$table->add (4, 0, new CFClient::UI::Button	349	$table->add (4, 0, new CFPlus::UI::Button
284	text => "Accept",	350	text => "Accept",
285	on_activate => sub {	351	on_activate => sub {
286	$conn->send ("reply n");	352	$conn->send ("reply n");
287	$STATS_PAGE->hide;	353	$STATS_PAGE->hide;
288	destroy_query_dialog $conn;	354	destroy_query_dialog $conn;
289	0	355	0
290	},	356	},
291	);	357	);
292		358
293	unshift @dialog, my $hbox = new CFClient::UI::HBox;	359	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
294	for (	360	for (
295	[Str => CS_STAT_STR],	361	[Str => CS_STAT_STR],
296	[Dex => CS_STAT_DEX],	362	[Dex => CS_STAT_DEX],
297	[Con => CS_STAT_CON],	363	[Con => CS_STAT_CON],
298	[Int => CS_STAT_INT],	364	[Int => CS_STAT_INT],
299	[Wis => CS_STAT_WIS],	365	[Wis => CS_STAT_WIS],
300	[Pow => CS_STAT_POW],	366	[Pow => CS_STAT_POW],
301	[Cha => CS_STAT_CHA],	367	[Cha => CS_STAT_CHA],
302	) {	368	) {
303	my ($name, $id) = @$_;	369	my ($name, $id) = @$_;
304	$hbox->add (new CFClient::UI::Label	370	$hbox->add (new CFPlus::UI::Label
305	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",	371	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306	align => 0,	372	align => 0,
307	expand => 1,	373	expand => 1,
308	can_events => 1,	374	can_events => 1,
309	can_hover => 1,	375	can_hover => 1,
310	tooltip => $CFClient::STAT_TOOLTIP{$name},	376	tooltip => "#stat_$name",
311	);	377	);
312	}	378	}
313		379
314	unshift @dialog, new CFClient::UI::Label	380	unshift @dialog, new CFPlus::UI::Label
315	max_w => $::WIDTH * 0.4,	381	max_w => $::WIDTH * 0.4,
316	ellipsise => 0,	382	ellipsise => 0,
317	markup =>	383	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
318	"<big><b>Character Creation: Stats</b></big>\n\n"
319	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
320	. "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
321	. "They will be modified later by both the race and the class you choose.\n\n"
322	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
323	;	384	;
324	}	385	}
325		386
326	push @dialog, my $entry = new CFClient::UI::Entry	387	push @dialog, my $entry = new CFPlus::UI::Entry
327	on_changed => sub {	388	on_changed => sub {
328	$conn->send ("reply $_[1]");	389	$conn->send ("reply $_[1]");
329	destroy_query_dialog $conn;	390	destroy_query_dialog $conn;
330	0	391	0
331	},	392	},
…		…
334	$entry->grab_focus;	395	$entry->grab_focus;
335		396
336	} else {	397	} else {
337	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	398	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
338		399
339	push @dialog, my $entry = new CFClient::UI::Entry	400	push @dialog, my $entry = new CFPlus::UI::Entry
340	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	401	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
341	on_activate => sub {	402	on_activate => sub {
342	$conn->send ("reply $_[1]");	403	$conn->send ("reply $_[1]");
343	destroy_query_dialog $conn;	404	destroy_query_dialog $conn;
344	0	405	0
…		…
358	$LOGIN_BUTTON->set_text ("Logout");	419	$LOGIN_BUTTON->set_text ("Logout");
359	$SETUP_DIALOG->hide;	420	$SETUP_DIALOG->hide;
360		421
361	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	422	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
362		423
363	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	424	my ($host, $port) = split /:/, $PROFILE->{host};
364		425
365	$MAP = new CFClient::Map $mapsize, $mapsize;	426	$MAP = new CFPlus::Map;
366		427
367	$CONN = eval {	428	$CONN = eval {
368	new CFClient::Protocol	429	new CFPlus::Protocol
369	host => $host,	430	host => $host,
370	port => $port || 13327,	431	port => $port || 13327,
371	user => $CFG->{profile}{default}{user},	432	user => $PROFILE->{user},
372	pass => $CFG->{profile}{default}{password},	433	pass => $PROFILE->{password},
373	mapw => $mapsize,	434	mapw => $mapsize,
374	maph => $mapsize,	435	maph => $mapsize,
		436
		437	client => "cfplus $CFPlus::VERSION $] $^O",
375		438
376	map_widget => $MAPWIDGET,	439	map_widget => $MAPWIDGET,
377	logview => $LOGVIEW,	440	logview => $LOGVIEW,
378	statusbox => $STATUSBOX,	441	statusbox => $STATUSBOX,
379	map => $MAP,	442	map => $MAP,
380	mapmap => $MAPMAP,	443	mapmap => $MAPMAP,
381	query => \&server_query,	444	query => \&server_query,
382		445
		446	setup_req => {
		447	smoothing => $CFG->{map_smoothing}*1,
		448	},
		449
383	sound_play => sub {	450	sound_play => sub {
384	my ($x, $y, $soundnum, $type) = @_;	451	my ($x, $y, $soundnum, $type) = @_;
385		452
386	$SDL_MIXER	453	$SDL_MIXER
387	or return;	454	or return;
…		…
392	$chunk->play;	459	$chunk->play;
393	},	460	},
394	};	461	};
395		462
396	if ($CONN) {	463	if ($CONN) {
397	CFClient::lowdelay fileno $CONN->{fh};	464	CFPlus::lowdelay fileno $CONN->{fh};
398		465
399	status "login successful";	466	status "login successful";
400	} else {	467	} else {
401	status "unable to connect";	468	status "unable to connect";
402	stop_game();	469	stop_game();
…		…
406	sub stop_game {	473	sub stop_game {
407	$LOGIN_BUTTON->set_text ("Login");	474	$LOGIN_BUTTON->set_text ("Login");
408	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	475	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
409	$SETUP_DIALOG->show;	476	$SETUP_DIALOG->show;
410	$PL_WINDOW->hide;	477	$PL_WINDOW->hide;
411	$SPELL_PAGE->clear_spells;	478	$SPELL_LIST->clear_spells;
412		479
413	return unless $CONN;	480	return unless $CONN;
414		481
415	status "connection closed";	482	status "connection closed";
416		483
…		…
420		487
421	undef $MAP;	488	undef $MAP;
422	}	489	}
423		490
424	sub graphics_setup {	491	sub graphics_setup {
425	my $vbox = new CFClient::UI::VBox;	492	my $vbox = new CFPlus::UI::VBox;
426		493
427	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	494	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
428		495
		496	my $row = 0;
		497
		498	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
		499	$table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
		500	can_events => 1,
		501	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
		502
429	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	503	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
430	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	504	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
431		505
432	$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]);	506	$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]);
433	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	507	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
434		508
435	$mode_slider->connect (changed => sub {	509	$mode_slider->connect (changed => sub {
436	my ($self, $value) = @_;	510	my ($self, $value) = @_;
437		511
438	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	512	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
439	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	513	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
440	});	514	});
441	$mode_slider->emit (changed => $mode_slider->{range}[0]);	515	$mode_slider->emit (changed => $mode_slider->{range}[0]);
442		516
443	my $row = 1;
444
445	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	517	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
446	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox	518	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447	state => $CFG->{fullscreen},	519	state => $CFG->{fullscreen},
448	tooltip => "Bring the client into fullscreen mode.",	520	tooltip => "Bring the client into fullscreen mode.",
449	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	521	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450	);	522	);
451		523
452	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	524	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
453	$table->add (1, $row++, new CFClient::UI::CheckBox	525	$table->add (1, $row++, new CFPlus::UI::CheckBox
454	state => $CFG->{fast},	526	state => $CFG->{fast},
455	tooltip => "Lower the visual quality considerably to speed up rendering.",	527	tooltip => "Lower the visual quality considerably to speed up rendering.",
456	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	528	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457	);	529	);
458		530
		531	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		532	$table->add (1, $row++, new CFPlus::UI::Slider
		533	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
		534	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
		535	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
		536	);
		537
		538	$table->add (1, $row++, new CFPlus::UI::Button
		539	expand => 1, align => 0, text => "Apply",
		540	tooltip => "Apply the video settings above.",
		541	on_activate => sub {
		542	video_shutdown ();
		543	video_init ();
		544	0
		545	}
		546	);
		547
459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	548	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
460	$table->add (1, $row++, new CFClient::UI::Slider	549	$table->add (1, $row++, new CFPlus::UI::Slider
461	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	550	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	551	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	552	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
464	);	553	);
465		554
		555	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
		556	$table->add (1, $row++, new CFPlus::UI::CheckBox
		557	state => $CFG->{map_smoothing},
		558	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
		559	. "This increases load on the graphics subsystem and works only with 2.x servers. "
		560	. "Changes take effect at next connection only.",
		561	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
		562	);
		563
466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	564	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
467	$table->add (1, $row++, new CFClient::UI::CheckBox	565	$table->add (1, $row++, new CFPlus::UI::CheckBox
468	state => $CFG->{fow_enable},	566	state => $CFG->{fow_enable},
469	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	567	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
470	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	568	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471	);	569	);
472		570
473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	571	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
474	$table->add (1, $row++, new CFClient::UI::Slider	572	$table->add (1, $row++, new CFPlus::UI::Slider
475	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	573	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
476	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	574	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
477	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	575	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478	);	576	);
479		577
480	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	578	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
481	$table->add (1, $row++, new CFClient::UI::CheckBox	579	$table->add (1, $row++, new CFPlus::UI::CheckBox
482	state => $CFG->{fow_smooth},	580	state => $CFG->{fow_smooth},
483	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	581	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
484	on_changed => sub {	582	on_changed => sub {
485	my ($self, $value) = @_;	583	my ($self, $value) = @_;
486	$CFG->{fow_smooth} = $value;	584	$CFG->{fow_smooth} = $value;
487	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	585	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
488	0	586	0
489	}	587	}
490	);	588	);
491		589
492	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
493	$table->add (1, $row++, new CFClient::UI::Slider
494	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
495	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
496	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
497	);
498
499	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	590	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
500	$table->add (1, $row++, new CFClient::UI::Slider	591	$table->add (1, $row++, new CFPlus::UI::Slider
501	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	592	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
502	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	593	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
503	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	594	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504	);	595	);
505		596
506	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	597	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
507	$table->add (1, $row++, new CFClient::UI::Slider	598	$table->add (1, $row++, new CFPlus::UI::Slider
508	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	599	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
509	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	600	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
510	on_changed => sub {	601	on_changed => sub {
511	$CFG->{gauge_fontsize} = $_[1];	602	$CFG->{gauge_fontsize} = $_[1];
512	&set_gauge_window_fontsize;	603	&set_gauge_window_fontsize;
513	0	604	0
514	}	605	}
515	);	606	);
516		607
517	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	608	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
518	$table->add (1, $row++, new CFClient::UI::Slider	609	$table->add (1, $row++, new CFPlus::UI::Slider
519	range => [$CFG->{gauge_size}, 0.2, 0.8],	610	range => [$CFG->{gauge_size}, 0.2, 0.8],
520	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	611	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
521	on_changed => sub {	612	on_changed => sub {
522	$CFG->{gauge_size} = $_[1];	613	$CFG->{gauge_size} = $_[1];
523	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	614	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524	0	615	0
525	}	616	}
526	);	617	);
527		618
528	$table->add (1, $row++, new CFClient::UI::Button
529	expand => 1, align => 0, text => "Apply",
530	tooltip => "Apply the video settings",
531	on_activate => sub {
532	video_shutdown ();
533	video_init ();
534	0
535	}
536	);
537
538	$vbox	619	$vbox
539	}	620	}
540		621
541	sub audio_setup {	622	sub audio_setup {
542	my $vbox = new CFClient::UI::VBox;	623	my $vbox = new CFPlus::UI::VBox;
543		624
544	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	625	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
545		626
546	my $row = 0;	627	my $row = 0;
547		628
548	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	629	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
549	$table->add (1, $row++, new CFClient::UI::CheckBox	630	$table->add (1, $row++, new CFPlus::UI::CheckBox
550	state => $CFG->{audio_enable},	631	state => $CFG->{audio_enable},
551	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.",	632	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.",
552	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	633	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
553	);	634	);
554	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	635	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
555	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	636	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
556	# $CFG->{effects_volume} = $_[1];	637	# $CFG->{effects_volume} = $_[1];
557	# });	638	# });
558	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	639	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
559	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	640	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
560	$hbox->add (new CFClient::UI::CheckBox	641	$hbox->add (new CFPlus::UI::CheckBox
561	expand => 1, state => $CFG->{bgm_enable},	642	expand => 1, state => $CFG->{bgm_enable},
562	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	643	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
563	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	644	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
564	);	645	);
565	$hbox->add (new CFClient::UI::Slider	646	$hbox->add (new CFPlus::UI::Slider
566	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	647	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567	tooltip => "The volume of the background music. Changes are instant.",	648	tooltip => "The volume of the background music. Changes are instant.",
568	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }	649	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
569	);	650	);
570		651
571	$table->add (1, $row++, new CFClient::UI::Button	652	$table->add (1, $row++, new CFPlus::UI::Button
572	expand => 1, align => 0, text => "Apply",	653	expand => 1, align => 0, text => "Apply",
573	tooltip => "Apply the audio settings",	654	tooltip => "Apply the audio settings",
574	on_activate => sub {	655	on_activate => sub {
575	audio_shutdown ();	656	audio_shutdown ();
576	audio_init ();	657	audio_init ();
…		…
588	}	669	}
589		670
590	sub make_gauge_window {	671	sub make_gauge_window {
591	my $gh = int $HEIGHT * $CFG->{gauge_size};	672	my $gh = int $HEIGHT * $CFG->{gauge_size};
592		673
593	my $win = new CFClient::UI::Frame (	674	my $win = new CFPlus::UI::Frame (
594	force_x => 0,	675	force_x => 0,
595	force_y => "max",	676	force_y => "max",
596	force_w => $WIDTH,	677	force_w => $WIDTH,
597	force_h => $gh,	678	force_h => $gh,
598	);	679	);
599		680
600	$win->add (my $hbox = new CFClient::UI::HBox	681	$win->add (my $hbox = new CFPlus::UI::HBox
601	children => [	682	children => [
602	(new CFClient::UI::HBox expand => 1),	683	(new CFPlus::UI::HBox expand => 1),
603	(new CFClient::UI::VBox children => [	684	(new CFPlus::UI::VBox children => [
604	(new CFClient::UI::Empty expand => 1),	685	(new CFPlus::UI::Empty expand => 1),
605	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	686	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
606	]),	687	]),
607	(my $vbox = new CFClient::UI::VBox),	688	(my $vbox = new CFPlus::UI::VBox),
608	],	689	],
609	);	690	);
610		691
611	$vbox->add (new CFClient::UI::HBox	692	$vbox->add (new CFPlus::UI::HBox
612	expand => 1,	693	expand => 1,
613	children => [	694	children => [
614	(new CFClient::UI::Empty expand => 1),	695	(new CFPlus::UI::Empty expand => 1),
615	(my $hb = new CFClient::UI::HBox),	696	(my $hb = new CFPlus::UI::HBox),
616	],	697	],
617	);	698	);
618		699
619	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	700	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
620	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.");
621	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	701	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
622	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.");
623	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	702	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
624	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.");
625	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	703	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
626	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.");
627		704
628	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	705	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
629	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.");
630	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	706	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
631	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
632		707
633	$GAUGES = {	708	$GAUGES = {
634	exp => $exp, win => $win, range => $rng,	709	exp => $exp, win => $win, range => $rng,
635	food => $fg, mana => $mg, hp => $hg, grace => $gg	710	food => $fg, mana => $mg, hp => $hg, grace => $gg
636	};	711	};
…		…
639		714
640	$win	715	$win
641	}	716	}
642		717
643	sub debug_setup {	718	sub debug_setup {
644	my $table = new CFClient::UI::Table;	719	my $table = new CFPlus::UI::Table;
645		720
646	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	721	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
647	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	722	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
648	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");	723	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
649	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	724	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
650	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	725	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
651	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	726	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
652	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	727	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
653	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	728	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		729	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
654		730
655	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	731	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
656		732
657	for my $x (0..2) {	733	for my $x (0..2) {
658	for my $y (0 .. 2) {	734	for my $y (0 .. 2) {
659	$table->add ($x + 3, $y,	735	$table->add ($x + 3, $y,
660	new CFClient::UI::Entry	736	new CFPlus::UI::Entry
661	text => $default_smooth[$x * 3 + $y],	737	text => $default_smooth[$x * 3 + $y],
662	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	738	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
663	);	739	);
664	}	740	}
665	}	741	}
666		742
		743	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
667		744
668	$table	745	$table
669	}	746	}
670		747
671	sub stats_window {	748	sub stats_window {
672	my $r = new CFClient::UI::ScrolledWindow (	749	my $r = new CFPlus::UI::ScrolledWindow (
673	expand => 1,	750	expand => 1,
674	scroll_y => 1	751	scroll_y => 1
675	);	752	);
676	$r->add (my $vb = new CFClient::UI::VBox);	753	$r->add (my $vb = new CFPlus::UI::VBox);
677		754
		755	$vb->add (new CFPlus::UI::FancyFrame
		756	label => "Player",
		757	child => (my $pi = new CFPlus::UI::VBox),
		758	);
		759
678	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	760	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679	can_hover => 1, can_events => 1,	761	can_hover => 1, can_events => 1,
680	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	762	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
681	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	763	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682	can_hover => 1, can_events => 1,	764	can_hover => 1, can_events => 1,
683	tooltip => "The map you are currently on (if supported by the server).");	765	tooltip => "The map you are currently on (if supported by the server).");
684		766
685	$vb->add (my $hb0 = new CFClient::UI::HBox);	767	$pi->add (my $hb0 = new CFPlus::UI::HBox);
686	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	768	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687	can_hover => 1, can_events => 1,	769	can_hover => 1, can_events => 1,
688	tooltip => "The weight of the player including all inventory items.");	770	tooltip => "The weight of the player including all inventory items.");
689	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	771	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
690	can_hover => 1, can_events => 1,	772	can_hover => 1, can_events => 1,
691	tooltip => "The weight limit: you cannot carry more than this.");	773	tooltip => "The weight limit: you cannot carry more than this.");
692		774
693		775	$vb->add (new CFPlus::UI::FancyFrame
		776	label => "Primary/Secondary Statistics",
694	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	777	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		778	);
695	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	779	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
696		780
697	my $color2 = [1, 1, 0];	781	my $color2 = [1, 1, 0];
698		782
699	for (	783	for (
700	[0, 0, st_str => "Str", 30],	784	[0, 0, st_str => "Str", 30],
…		…
712	[2, 4, st_spd => "Spd", 10.54],	796	[2, 4, st_spd => "Spd", 10.54],
713	[2, 5, st_wspd => "WSp", 10.54],	797	[2, 5, st_wspd => "WSp", 10.54],
714	) {	798	) {
715	my ($col, $row, $id, $label, $template) = @$_;	799	my ($col, $row, $id, $label, $template) = @$_;
716		800
717	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	801	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
718	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	802	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	803	align => +1, template => $template, tooltip => "#stat_$label");
720	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	804	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
721	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	805	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
722	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	806	align => -1, text => $label, tooltip => "#stat_$label");
723	}	807	}
724		808
		809	$vb->add (new CFPlus::UI::FancyFrame
		810	label => "Resistancies",
725	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	811	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		812	);
726		813
727	my $row = 0;	814	my $row = 0;
728	my $col = 0;	815	my $col = 0;
729		816
730	my %resist_names = (	817	my %resist_names = (
…		…
769	drain acid pois para deat phys	856	drain acid pois para deat phys
770	blind fear tund elec cold ghit/)	857	blind fear tund elec cold ghit/)
771	{	858	{
772	$tbl2->add ($col, $row,	859	$tbl2->add ($col, $row,
773	$STATWIDS->{"res_$_"} =	860	$STATWIDS->{"res_$_"} =
774	new CFClient::UI::Label	861	new CFPlus::UI::Label
775	font => $FONT_FIXED,	862	font => $FONT_FIXED,
776	template => "-100%",	863	template => "-100%",
777	align => +1,	864	align => +1,
778	valign => 0,	865	valign => 0,
779	can_events => 1,	866	can_events => 1,
780	can_hover => 1,	867	can_hover => 1,
781	tooltip => $resist_names{$_}->[1],	868	tooltip => $resist_names{$_}->[1],
782	);	869	);
783	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	870	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
784	font => $FONT_FIXED,	871	font => $FONT_FIXED,
785	can_hover => 1,	872	can_hover => 1,
786	can_events => 1,	873	can_events => 1,
787	path => "ui/resist/resist_$_.png",	874	path => "ui/resist/resist_$_.png",
788	tooltip => $resist_names{$_}->[1],	875	tooltip => $resist_names{$_}->[1],
789	);	876	);
790	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	877	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
791	text => $resist_names{$_}->[0],	878	text => $resist_names{$_}->[0],
792	font => $FONT_FIXED,	879	font => $FONT_FIXED,
793	can_hover => 1,	880	can_hover => 1,
794	can_events => 1,	881	can_events => 1,
795	tooltip => $resist_names{$_}->[1],	882	tooltip => $resist_names{$_}->[1],
…		…
806		893
807	$r	894	$r
808	}	895	}
809		896
810	sub skill_window {	897	sub skill_window {
811	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	898	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
812	$sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);	899	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
813	$sw	900	$sw
814	}	901	}
815		902
816	sub formsep($) {	903	sub formsep($) {
817	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	904	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
828	return if $METASERVER_ATIME > time;	915	return if $METASERVER_ATIME > time;
829	$METASERVER_ATIME = time + 60;	916	$METASERVER_ATIME = time + 60;
830		917
831	my $table = $METASERVER->{table};	918	my $table = $METASERVER->{table};
832	$table->clear;	919	$table->clear;
833	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	920	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834		921
835	my $buf;	922	my $ok = 0;
836		923
837	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	924	CFPlus::background {
		925	my $ua = CFPlus::lwp_useragent;
838		926
839	unless ($fh) {	927	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840	$label->set_text ("unable to contact metaserver: $!");	928	} sub {
841	return;	929	my ($msg) = @_;
842	}	930	if ($msg) {
843
844	Event->io (fd => $fh, poll => 'r', cb => sub {
845	my $res = sysread $fh, $buf, 8192, length $buf;
846
847	if (!defined $res) {
848	$_[0]->w->cancel;
849	$label->set_text ("error while retrieving server list: $!");
850	} elsif ($res == 0) {
851	$_[0]->w->cancel;
852	status "server list retrieved";
853
854	utf8::decode $buf if utf8::valid $buf;
855
856	$table->clear;	931	$table->clear;
857		932
858	my @tip = (	933	my @tip = (
859	"The current number of users logged in on the server.",	934	"The current number of users logged in on the server.",
860	"The hostname of the server.",	935	"The hostname of the server.",
861	"The time this server has been running without being restarted.",	936	"The time this server has been running without being restarted.",
862	"The server software version - a '+' indicates a Crossfire+ server.",	937	"The server software version - a '+' indicates a Crossfire+ server.",
863	"Short information about this server provided by its admins.",	938	"Short information about this server provided by its admins.",
864	);	939	);
865	my @col = qw(#Users Host Uptime Version Description);	940	my @col = qw(#Users Host Uptime Version Description);
866	$table->add ($_, 0, new CFClient::UI::Label	941	$table->add ($_, 0, new CFPlus::UI::Label
867	can_hover => 1, can_events => 1,	942	can_hover => 1, can_events => 1,
868	align => 0, fg => [1, 1, 0],	943	align => 0, fg => [1, 1, 0],
869	text => $col[$_], tooltip => $tip[$_])	944	text => $col[$_], tooltip => $tip[$_])
870	for 0 .. $#col;	945	for 0 .. $#col;
871		946
872	my @align = qw(1 0 1 1 -1);	947	my @align = qw(1 0 1 1 -1);
873		948
874	my $y = 0;	949	my $y = 0;
875	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	950	for my $m (@{ $msg->{servers} }) {
876	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	951	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
		952	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
877		953
878	for ($desc) {	954	for ($desc) {
879	s/<br>/\n/gi;	955	s/<br>/\n/gi;
880	s/<li>/\n· /gi;	956	s/<li>/\n· /gi;
881	s/<.*?>//sgi;	957	s/<.*?>//sgi;
882	s/&/&amp;/g;	958	s/&amp;/&/g;
883	s/</&lt;/g;	959	s/&lt;/</g;
884	s/>/&gt;/g;	960	s/&gt;/>/g;
885	}	961	}
886		962
887	$uptime = sprintf "%dd %02d:%02d:%02d",	963	$uptime = sprintf "%dd %02d:%02d:%02d",
888	(int $m->[8] / 86400),	964	(int $uptime / 86400),
889	(int $m->[8] / 3600) % 24,	965	(int $uptime / 3600) % 24,
890	(int $m->[8] / 60) % 60,	966	(int $uptime / 60) % 60,
891	$m->[8] % 60;	967	$uptime % 60;
892		968
893	$m = [$users, $host, $uptime, $version, $desc];	969	$m = [$users, $host, $uptime, $version, $desc];
894		970
895	$y++;	971	$y++;
896		972
897	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	973	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
898	(new CFClient::UI::Button	974	(new CFPlus::UI::Button
899	text => "Use",	975	text => "Use",
900	tooltip => "Put this server into the <b>Host:Port</b> field",	976	tooltip => "Put this server into the <b>Host:Port</b> field",
901	on_activate => sub {	977	on_activate => sub {
902	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	978	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
903	$METASERVER->hide;	979	$METASERVER->hide;
904	0	980	0
905	},	981	},
906	),	982	),
907	(new CFClient::UI::Empty expand => 1),	983	(new CFPlus::UI::Empty expand => 1),
908	]);	984	]);
909		985
910	$table->add ($_, $y, new CFClient::UI::Label	986	$table->add ($_, $y, new CFPlus::UI::Label
		987	max_w => $::WIDTH * 0.4,
911	ellipsise => 0,	988	ellipsise => 0,
912	align => $align[$_],	989	align => $align[$_],
913	text => $m->[$_],	990	text => $m->[$_],
914	tooltip => $tip[$_],	991	tooltip => $tip[$_],
		992	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
915	can_hover => 1,	993	can_hover => 1,
916	can_events => 1,	994	can_events => 1,
917	fontsize => 0.8)	995	fontsize => 0.8)
918	for 0 .. $#$m;	996	for 0 .. $#$m;
919	}	997	}
		998	} else {
		999	$ok or $label->set_text ("error while contacting metaserver");
920	}	1000	}
921	});	1001	};
		1002
922	}	1003	}
923		1004
924	sub metaserver_dialog {	1005	sub metaserver_dialog {
925	my $vbox = new CFClient::UI::VBox;	1006	my $vbox = new CFPlus::UI::VBox;
926	my $table = new CFClient::UI::Table;	1007	my $table = new CFPlus::UI::Table;
927	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	1008	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
928		1009
929	my $dialog = new CFClient::UI::FancyFrame	1010	my $dialog = new CFPlus::UI::Toplevel
930	title => "Server List",	1011	title => "Server List",
931	name => 'metaserver_dialog',	1012	name => 'metaserver_dialog',
932	x => 'center',	1013	x => 'center',
933	y => 'center',	1014	y => 'center',
934	z => 3,	1015	z => 3,
		1016	force_w => $::WIDTH * 0.9,
935	force_h => $::HEIGHT * 0.4,	1017	force_h => $::HEIGHT * 0.7,
936	child => $vbox,	1018	child => $vbox,
937	has_close_button => 1,	1019	has_close_button => 1,
938	table => $table,	1020	table => $table,
939	on_visibility_change => sub {	1021	on_visibility_change => sub {
940	update_metaserver ($_[0]) if $_[1];	1022	update_metaserver ($_[0]) if $_[1];
…		…
944		1026
945	$dialog	1027	$dialog
946	}	1028	}
947		1029
948	sub server_setup {	1030	sub server_setup {
949	my $vbox = new CFClient::UI::VBox;	1031	my $vbox = new CFPlus::UI::VBox;
950		1032
		1033	$vbox->add (new CFPlus::UI::FancyFrame
		1034	label => "Connection Settings",
951	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	1035	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		1036	);
952	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	1037	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
953		1038
954	{	1039	{
955	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	1040	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
956		1041
957	$vbox->add (	1042	$vbox->add (
958	$HOST_ENTRY = new CFClient::UI::Entry	1043	$HOST_ENTRY = new CFPlus::UI::Entry
959	expand => 1,	1044	expand => 1,
960	text => $CFG->{profile}{default}{host},	1045	text => $CFG->{profile}{default}{host},
961	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1046	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
962	on_changed => sub {	1047	on_changed => sub {
963	my ($self, $value) = @_;	1048	my ($self, $value) = @_;
964	$CFG->{profile}{default}{host} = $value;	1049	$CFG->{profile}{default}{host} = $value;
965	0	1050	0
966	}	1051	}
967	);	1052	);
968		1053
969	$vbox->add (new CFClient::UI::Button	1054	$vbox->add (new CFPlus::UI::Button
970	expand => 1,	1055	expand => 1,
971	text => "Server List",	1056	text => "Server List",
972	other => $METASERVER,	1057	other => $METASERVER,
973	tooltip => "Show a list of available crossfire servers",	1058	tooltip => "Show a list of available crossfire servers",
974	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1059	on_activate => sub { $METASERVER->toggle_visibility; 0 },
975	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1060	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
976	);	1061	);
977	}	1062	}
978		1063
979	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1064	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
980	$table->add (1, 4, new CFClient::UI::Entry	1065	$table->add (1, 4, new CFPlus::UI::Entry
981	text => $CFG->{profile}{default}{user},	1066	text => $CFG->{profile}{default}{user},
982	tooltip => "The name of your character on the server",	1067	tooltip => "The name of your character on the server",
983	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1068	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
984	);	1069	);
985		1070
986	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1071	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
987	$table->add (1, 5, new CFClient::UI::Entry	1072	$table->add (1, 5, new CFPlus::UI::Entry
988	text => $CFG->{profile}{default}{password},	1073	text => $CFG->{profile}{default}{password},
989	hidden => 1,	1074	hidden => 1,
990	tooltip => "The password for your character",	1075	tooltip => "The password for your character",
991	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1076	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
992	);	1077	);
993		1078
994	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1079	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
995	$table->add (1, 7, new CFClient::UI::Slider	1080	$table->add (1, 7, new CFPlus::UI::Slider
996	force_w => 100,	1081	force_w => 100,
997	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1082	range => [$CFG->{mapsize}, 10, 100, 0, 1],
998	tooltip => "This is the size of the portion of the map update the server sends you. "	1083	tooltip => "This is the size of the portion of the map update the server sends you. "
999	. "If you set this to a high value you will be able to see further, "	1084	. "If you set this to a high value you will be able to see further, "
1000	. "but you also increase bandwidth requirements and latency. "	1085	. "but you also increase bandwidth requirements and latency. "
1001	. "This option is only used once at log-in.",	1086	. "This option is only used once at log-in.",
1002	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1087	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1003	);	1088	);
1004		1089
1005	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1090	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006	$table->add (1, 8, new CFClient::UI::CheckBox	1091	$table->add (1, 8, new CFPlus::UI::CheckBox
1007	state => $CFG->{face_prefetch},	1092	state => $CFG->{face_prefetch},
1008	tooltip => "<b>Background Image Prefetch</b>\n\n"	1093	tooltip => "<b>Background Image Prefetch</b>\n\n"
1009	. "If enabled, the client automatically pre-fetches images from the server. "	1094	. "If enabled, the client automatically pre-fetches images from the server. "
1010	. "This might increase or create lag, but increases the chances "	1095	. "This might increase or create lag, but increases the chances "
1011	. "of faces being ready for display when you encounter them. "	1096	. "of faces being ready for display when you encounter them. "
…		…
1013	. "so only set it if you really need to prefetch images. "	1098	. "so only set it if you really need to prefetch images. "
1014	. "This option can be set and unset any time.",	1099	. "This option can be set and unset any time.",
1015	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1100	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016	);	1101	);
1017		1102
		1103	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
		1104	$table->add (1, 9, new CFPlus::UI::Entry
		1105	text => $CFG->{output_rate},
		1106	tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
		1107	. "when sending images, to ensure interactiveness. When 0 or unset, the server "
		1108	. "default will be used, which is usually around 100kb/s.",
		1109	on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
		1110	);
		1111
1018	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1112	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1019	$table->add (1, 9, new CFClient::UI::Entry	1113	$table->add (1, 10, new CFPlus::UI::Entry
1020	text => $CFG->{output_count},	1114	text => $CFG->{output_count},
1021	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1115	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1116	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023	);	1117	);
1024		1118
1025	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1119	$table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026	$table->add (1, 10, new CFClient::UI::Entry	1120	$table->add (1, 11, new CFPlus::UI::Entry
1027	text => $CFG->{output_sync},	1121	text => $CFG->{output_sync},
1028	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1122	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1123	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030	);	1124	);
1031		1125
1032	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1126	$table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1033	expand => 1,	1127	expand => 1,
1034	align => 0,	1128	align => 0,
1035	text => "Login",	1129	text => "Login",
1036	on_activate => sub {	1130	on_activate => sub {
1037	$CONN ? stop_game	1131	$CONN ? stop_game
1038	: start_game;	1132	: start_game;
1039	0	1133	0
1040	},	1134	},
1041	);	1135	);
1042		1136
		1137	$vbox->add (new CFPlus::UI::FancyFrame
		1138	label => "Server Info",
		1139	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1140	);
		1141
		1142	$vbox
		1143	}
		1144
		1145	sub client_setup {
		1146	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
		1147
		1148	my $row = 0;
		1149
1043	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1150	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1044	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1151	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1045	text => $CFG->{say_command},	1152	text => $CFG->{say_command},
1046	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. "	1153	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. "
1047	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1154	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1048	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1155	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1049	on_changed => sub {	1156	on_changed => sub {
1050	my ($self, $value) = @_;	1157	my ($self, $value) = @_;
1051	$CFG->{say_command} = $value;	1158	$CFG->{say_command} = $value;
1052	0	1159	0
1053	}	1160	}
1054	);	1161	);
1055		1162
1056	$vbox->add (new CFClient::UI::Label	1163	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1057	text => "Server Info",	1164	$table->add (1, $row++, new CFPlus::UI::CheckBox
1058	fontsize => 1.2,	1165	state => $CFG->{show_tips},
1059	padding_y => 8,	1166	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1060	fg => [1, 1, 0, 1],	1167	on_changed => sub {
		1168	my ($self, $value) = @_;
		1169	$CFG->{show_tips} = $value;
		1170	0
		1171	}
1061	);	1172	);
1062		1173
1063	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);	1174	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
		1175	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
		1176	text => $CFG->{logview_max_par},
		1177	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
		1178	. "sends more messages than this number, older messages get removed to save memory and "
		1179	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
		1180	on_changed => sub {
		1181	my ($self, $value) = @_;
		1182	$LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
		1183	0
		1184	},
		1185	);
1064		1186
1065	$vbox	1187	$table
1066	}	1188	}
1067		1189
1068	sub message_window {	1190	sub message_window {
1069	my $window = new CFClient::UI::FancyFrame	1191	my $window = new CFPlus::UI::Toplevel
1070	name => "message_window",	1192	name => "message_window",
1071	title => "Messages",	1193	title => "Messages",
1072	border_bg => [1, 1, 1, 1],	1194	border_bg => [1, 1, 1, 1],
1073	x => "max",	1195	x => "max",
1074	y => 0,	1196	y => 0,
1075	force_w => $::WIDTH * 0.4,	1197	force_w => $::WIDTH * 0.4,
1076	force_h => $::HEIGHT * 0.5,	1198	force_h => $::HEIGHT * 0.5,
1077	child => (my $vbox = new CFClient::UI::VBox),	1199	child => (my $vbox = new CFPlus::UI::VBox),
1078	has_close_button => 1;	1200	has_close_button => 1;
1079		1201
1080	$vbox->add ($LOGVIEW);	1202	$vbox->add ($LOGVIEW);
1081		1203
1082	$vbox->add (my $input = new CFClient::UI::Entry	1204	$vbox->add (my $input = new CFPlus::UI::Entry
1083	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1205	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1084	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1206	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1085	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1207	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1086	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1208	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1087	on_focus_in => sub {	1209	on_focus_in => sub {
…		…
1126	};	1248	};
1127		1249
1128	$window	1250	$window
1129	}	1251	}
1130		1252
1131	sub open_quit_dialog {
1132	unless ($QUIT_DIALOG) {
1133	$QUIT_DIALOG = new CFClient::UI::FancyFrame
1134	x => "center",
1135	y => "center",
1136	z => 50,
1137	title => "Really Quit?",
1138	;
1139
1140	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1141
1142	$vb->add (new CFClient::UI::Label
1143	text => "You should find a savebed and apply it first!",
1144	max_w => $WIDTH * 0.25,
1145	ellipsize => 0,
1146	);
1147	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1148	$hb->add (new CFClient::UI::Button
1149	text => "Ok",
1150	expand => 1,
1151	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1152	);
1153	$hb->add (new CFClient::UI::Button
1154	text => "Quit anyway",
1155	expand => 1,
1156	on_activate => sub { exit },
1157	);
1158	}
1159
1160	$QUIT_DIALOG->show;
1161	}
1162
1163	sub autopickup_setup {	1253	sub autopickup_setup {
1164	my $table = new CFClient::UI::Table;	1254	my $table = new CFPlus::UI::Table;
1165		1255
1166	for (	1256	for (
1167	["General", 0, 0,	1257	["General", 0, 0,
1168	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1258	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1169	["Inhibit autopickup" => PICKUP_INHIBIT],	1259	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1183	["Boots" => PICKUP_BOOTS],	1273	["Boots" => PICKUP_BOOTS],
1184	["Gloves" => PICKUP_GLOVES],	1274	["Gloves" => PICKUP_GLOVES],
1185	["Cloaks" => PICKUP_CLOAK],	1275	["Cloaks" => PICKUP_CLOAK],
1186	],	1276	],
1187		1277
1188	["Readables", 2, 2,	1278	["Readables", 2, 0,
1189	["Spellbooks" => PICKUP_SPELLBOOK],	1279	["Spellbooks" => PICKUP_SPELLBOOK],
1190	["Skillscrolls" => PICKUP_SKILLSCROLL],	1280	["Skillscrolls" => PICKUP_SKILLSCROLL],
1191	["Normal Books/Scrolls" => PICKUP_READABLES],	1281	["Normal Books/Scrolls" => PICKUP_READABLES],
1192	],	1282	],
1193	["Misc", 2, 7,	1283	["Misc", 2, 5,
1194	["Food" => PICKUP_FOOD],	1284	["Food" => PICKUP_FOOD],
1195	["Drinks" => PICKUP_DRINK],	1285	["Drinks" => PICKUP_DRINK],
1196	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1286	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1197	["Keys" => PICKUP_KEY],	1287	["Keys" => PICKUP_KEY],
1198	["Magical Items" => PICKUP_MAGICAL],	1288	["Magical Items" => PICKUP_MAGICAL],
1199	["Potions" => PICKUP_POTION],	1289	["Potions" => PICKUP_POTION],
1200	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1290	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1201	["Ignore cursed" => PICKUP_NOT_CURSED],	1291	["Ignore cursed" => PICKUP_NOT_CURSED],
1202	["Jewelery" => PICKUP_JEWELS],	1292	["Jewelery" => PICKUP_JEWELS],
		1293	["Flesh" => PICKUP_FLESH],
1203	],	1294	],
1204	["Weight/Value ratio", 2, 17]	1295	["Weight/Value ratio", 2, 17]
1205	)	1296	)
1206	{	1297	{
1207	my ($title, $x, $y, @bits) = @$_;	1298	my ($title, $x, $y, @bits) = @$_;
1208	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1299	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1209		1300
1210	for (@bits) {	1301	for (@bits) {
1211	++$y;	1302	++$y;
1212		1303
1213	my $mask = $_->[1];	1304	my $mask = $_->[1];
1214	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1305	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1215	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1306	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1216	state => $::CFG->{pickup} & $mask,	1307	state => $::CFG->{pickup} & $mask,
1217	on_changed => sub {	1308	on_changed => sub {
1218	my ($box, $value) = @_;	1309	my ($box, $value) = @_;
1219		1310
1220	if ($value) {	1311	if ($value) {
…		…
1231		1322
1232	${$_->[2]} = $checkbox if $_->[2];	1323	${$_->[2]} = $checkbox if $_->[2];
1233	}	1324	}
1234	}	1325	}
1235		1326
1236	$table->add (2, 18, new CFClient::UI::ValSlider	1327	$table->add (2, 18, new CFPlus::UI::ValSlider
1237	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1328	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1238	template => ">= 99",	1329	template => ">= 99",
1239	to_value => sub { ">= " . 5 * $_[0] },	1330	to_value => sub { ">= " . 5 * $_[0] },
1240	on_changed => sub {	1331	on_changed => sub {
1241	my ($slider, $value) = @_;	1332	my ($slider, $value) = @_;
…		…
1244	$::CFG->{pickup} |= int $value	1335	$::CFG->{pickup} |= int $value
1245	if $value;	1336	if $value;
1246	1;	1337	1;
1247	});	1338	});
1248		1339
1249	$table->add (3, 18, new CFClient::UI::Button	1340	$table->add (3, 18, new CFPlus::UI::Button
1250	text => "set",	1341	text => "set",
1251	on_activate => sub {	1342	on_activate => sub {
1252	$::CONN->send_command ("pickup $::CFG->{pickup}")	1343	$::CONN->send_command ("pickup $::CFG->{pickup}")
1253	if defined $::CONN;	1344	if defined $::CONN;
1254	0	1345	0
1255	});	1346	});
1256		1347
1257	$table	1348	$table
1258	}	1349	}
1259		1350
		1351	my %SORT_ORDER = (
		1352	type => undef,
		1353	mtime => sub {
		1354	my $NOW = time;
		1355	sort {
		1356	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1357	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1358
		1359	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1360	or $btime <=> $atime
		1361	or $a->{type} <=> $b->{type}
		1362	} @_
		1363	},
		1364	weight => sub { sort {
		1365	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1366	or $a->{type} <=> $b->{type}
		1367	} @_ },
		1368	);
		1369
1260	sub inventory_widget {	1370	sub inventory_widget {
1261	my $hb = new CFClient::UI::HBox homogeneous => 1;	1371	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1262		1372
1263	$hb->add (my $vb1 = new CFClient::UI::VBox);	1373	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1264	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1374	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1265		1375
1266	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1376	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1267		1377
1268	use sort 'stable';	1378	use sort 'stable';
1269		1379
1270	$hb1->add (new CFClient::UI::Combobox	1380	$hb1->add (new CFPlus::UI::Selector
1271	value => undef,	1381	value => $::CFG->{inv_sort},
1272	options => [	1382	options => [
1273	[undef, "Type/Name"],	1383	[type => "Type/Name"],
1274	[	1384	[mtime => "Recent/Normal/Locked"],
1275	sub { sort {
1276	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1277	or $a->{type} <=> $b->{type}
1278	} @_ },
1279	"Weight/Type",	1385	[weight => "Weight/Type"],
1280	],
1281	[sub { } => "#TODO#"],
1282	],	1386	],
1283	on_changed => sub {	1387	on_changed => sub {
		1388	$::CFG->{inv_sort} = $_[1];
1284	$INV->set_sort_order ($_[1]);	1389	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1285	},	1390	},
1286	);	1391	);
1287	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1392	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1288	#TODO# update to weigh/maxweight	1393	#TODO# update to weigh/maxweight
1289	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1394	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1290		1395
1291	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1396	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1292	$sw1->add ($INV = new CFClient::UI::Inventory);	1397	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1398	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1293		1399
1294	$hb->add (my $vb2 = new CFClient::UI::VBox);	1400	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1295		1401
1296	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1402	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1297		1403
1298	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1404	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1299	$sw2->add ($INVR = new CFClient::UI::Inventory);	1405	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1300		1406
1301	# XXX: Call after $INVR = ... because set_opencont sets the items	1407	# XXX: Call after $INVR = ... because set_opencont sets the items
1302	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1408	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1303		1409
1304	$hb	1410	$hb
1305	}	1411	}
1306		1412
1307	sub toggle_player_page {	1413	sub toggle_player_page {
…		…
1314	$PL_WINDOW->show;	1420	$PL_WINDOW->show;
1315	}	1421	}
1316	}	1422	}
1317		1423
1318	sub player_window {	1424	sub player_window {
1319	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1425	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1320	x => "center",	1426	x => "center",
1321	y => "center",	1427	y => "center",
1322	force_w => $WIDTH * 9/10,	1428	force_w => $WIDTH * 9/10,
1323	force_h => $HEIGHT * 9/10,	1429	force_h => $HEIGHT * 9/10,
1324	title => "Player",	1430	title => "Player",
…		…
1326	has_close_button => 1	1432	has_close_button => 1
1327	;	1433	;
1328		1434
1329	my $ntb =	1435	my $ntb =
1330	$PL_NOTEBOOK =	1436	$PL_NOTEBOOK =
1331	new CFClient::UI::Notebook expand => 1, debug => 1;	1437	new CFPlus::UI::Notebook expand => 1, debug => 1;
1332		1438
1333	$ntb->add (	1439	$ntb->add (
1334	"Statistics (F2)" => $STATS_PAGE = stats_window,	1440	"Statistics (F2)" => $STATS_PAGE = stats_window,
1335	"Shows statistics, where all your Stats and Resistances are shown."	1441	"Shows statistics, where all your Stats and Resistances are shown."
1336	);	1442	);
1337	$ntb->add (	1443	$ntb->add (
1338	"Skills (F3)" => $SKILL_PAGE = skill_window,	1444	"Skills (F3)" => $SKILL_PAGE = skill_window,
1339	"Shows all your Skills."	1445	"Shows all your Skills."
1340	);	1446	);
1341		1447
1342	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1448	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1343	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1449	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1344	$ntb->add (	1450	$ntb->add (
1345	"Spellbook (F4)" => $spellsw,	1451	"Spellbook (F4)" => $spellsw,
1346	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1452	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1347	);	1453	);
1348	$ntb->add (	1454	$ntb->add (
…		…
1355		1461
1356	$plwin->add ($ntb);	1462	$plwin->add ($ntb);
1357	$plwin	1463	$plwin
1358	}	1464	}
1359		1465
1360	sub update_bindings {
1361	$BIND_UPD_CB->() if $BIND_UPD_CB;
1362	}
1363
1364	sub keyboard_setup {	1466	sub keyboard_setup {
1365	my $binding_list = new CFClient::UI::VBox;	1467	CFPlus::Macro::keyboard_setup
1366
1367	my $refresh;
1368	$refresh = $BIND_UPD_CB = sub {
1369	$binding_list->clear ();
1370
1371	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1372	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1373	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1374	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1375
1376	my $lbl = join "; ", @$cmds;
1377	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1378	$binding_list->add (my $hb = new CFClient::UI::HBox);
1379	$hb->add (new CFClient::UI::Button
1380	text => "delete",
1381	tooltip => "Deletes the binding",
1382	on_activate => sub {
1383	$binding_list->remove ($hb);
1384	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1385	0
1386	});
1387
1388	$hb->add (new CFClient::UI::Button
1389	text => "edit",
1390	tooltip => "Edits the binding",
1391	on_activate => sub {
1392	$::BIND_EDITOR->set_binding (
1393	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1394	sub {
1395	my ($nmod, $nsym, $ncmds) = @_;
1396	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1397	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1398	$refresh->();
1399	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1400	$SETUP_DIALOG->show;
1401	},
1402	sub {
1403	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1404	$SETUP_DIALOG->show;
1405	});
1406	$::BIND_EDITOR->show;
1407	$SETUP_DIALOG->hide;
1408	0
1409	});
1410
1411	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1412	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1413	}
1414	}
1415	};
1416
1417	my $vb = new CFClient::UI::VBox;
1418	$vb->add (my $hb = new CFClient::UI::HBox);
1419	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1420	$hb->add (new CFClient::UI::CheckBox
1421	expand => 1,
1422	state => $CFG->{shift_fire_stop},
1423	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1424	on_changed => sub {
1425	my ($cbox, $value) = @_;
1426	$CFG->{shift_fire_stop} = $value;
1427	0
1428	});
1429
1430	$vb->add ($binding_list);
1431	$vb->add (my $hb = new CFClient::UI::HBox);
1432
1433	$hb->add (new CFClient::UI::Button
1434	text => "record new",
1435	expand => 1,
1436	tooltip => "This button opens the binding editor with an empty binding.",
1437	on_activate => sub {
1438	$::BIND_EDITOR->set_binding (undef, undef, [],
1439	sub {
1440	my ($mod, $sym, $cmds) = @_;
1441	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1442	$refresh->();
1443	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1444	$SETUP_DIALOG->show;
1445	},
1446	sub {
1447	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1448	$SETUP_DIALOG->show;
1449	},
1450	);
1451	$SETUP_DIALOG->hide;
1452	$::BIND_EDITOR->show;
1453	0
1454	},
1455	);
1456
1457	$hb->add (new CFClient::UI::Button
1458	text => "close",
1459	tooltip => "Closes the binding window",
1460	expand => 1,
1461	on_activate => sub {
1462	$SETUP_DIALOG->hide;
1463	0
1464	}
1465	);
1466
1467	$refresh->();
1468
1469	$vb
1470	}
1471
1472	# just weirdness, pls. ignore
1473	sub load_html_page {
1474	my ($viewer, $base) = @_;
1475
1476	$viewer->clear;
1477
1478	require LWP::Simple;
1479	require HTML::Parser;
1480	require URI;
1481
1482	my $page = LWP::Simple::get ($base)
1483	or return;
1484
1485	my @s = { };
1486	my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1487
1488	my $parser = HTML::Parser->new (
1489	text_h => [sub {
1490	my ($text) = @_;
1491	$text =~ s/\s+/ /g;
1492	$s[-1]{text} .= CFClient::asxml $text;
1493	}, "dtext"],
1494	start_h => [sub {
1495	my ($tag, $attr) = @_;
1496	if ($passthrough{$tag}) {
1497	$s[-1]{text} .= "<$tag>";
1498	} elsif ($tag eq "h1") {
1499	push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1500	} elsif ($tag eq "h2") {
1501	push @s, { text => "<span foreground='#ccccff' size='large'>" };
1502	} elsif ($tag eq "h3") {
1503	push @s, { text => "<span size='large'>" };
1504	} elsif ($tag eq "a") {
1505	push @s, { text => "", url => $attr->{href} };
1506	} elsif ($tag eq "p") {
1507	push @s, { };
1508	} elsif ($tag eq "img") {
1509	eval {
1510	push @{$s[-1]{obj}}, new CFClient::UI::Image
1511	tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1512	$s[-1]{text} .= "\x{fffc}";
1513	};
1514	}
1515	}, "tagname, attr"],
1516	end_h => [sub {
1517	my ($tag) = @_;
1518	if ($passthrough{$tag}) {
1519	$s[-1]{text} .= "</$tag>";
1520	} elsif ($tag =~ /^h\d$/) {
1521	$s[-1]{text} .= "</span>";
1522	push @s, { };
1523	} elsif ($tag eq "a") {
1524	my $S = pop @s;
1525	$s[-1]{text} .= "\x{fffc}";
1526	push @{$s[-1]{obj}}, new CFClient::UI::Label
1527	fg => [0.8, 0.8, 1],
1528	markup => "<u>$S->{text}</u>",
1529	fontsize => 0.8,
1530	can_events => 1,
1531	can_focus => 1,
1532	on_button_up => sub {
1533	load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1534	},
1535	;
1536	}
1537	}, "tagname"],
1538	);
1539
1540	$parser->parse ($page);
1541	$parser->eof;
1542
1543	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1544	for @s;
1545
1546	$viewer->set_offset (0);
1547	}	1468	}
1548		1469
1549	sub help_window {	1470	sub help_window {
1550	my $win = new CFClient::UI::FancyFrame	1471	my $win = new CFPlus::UI::Toplevel
1551	x => 'center',	1472	x => 'center',
1552	y => 'center',	1473	y => 'center',
1553	z => 2,	1474	z => 4,
1554	name => 'doc_browser',	1475	name => 'doc_browser',
1555	force_w => int $WIDTH * 7/8,	1476	force_w => int $WIDTH * 7/8,
1556	force_h => int $HEIGHT * 7/8,	1477	force_h => int $HEIGHT * 7/8,
1557	title => "Help Browser",	1478	title => "Help Browser",
1558	has_close_button => 1;	1479	has_close_button => 1;
1559		1480
1560	$win->add (my $vbox = new CFClient::UI::VBox);	1481	$win->add (my $vbox = new CFPlus::UI::VBox);
1561		1482
1562	$vbox->add (my $buttons = new CFClient::UI::HBox);	1483	$vbox->add (new CFPlus::UI::FancyFrame
		1484	label => "Navigation",
		1485	child => (my $buttons = new CFPlus::UI::HBox),
		1486	);
1563	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1487	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1564	expand => 1, fontsize => 0.8, padding_x => 4);	1488	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1565		1489
1566	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1490	my @history;
1567	$buttons->add (my $combo = new CFClient::UI::Combobox	1491	my @future;
1568	value => undef,	1492	my $curnode;
1569	options => [	1493
1570	[intro => "Introduction"],	1494	my $load_node; $load_node = sub {
1571	[manual => "Main Manual"],	1495	my ($node, $para) = @_;
1572	[skill_help => "Skill Reference"],	1496
1573	[command_help => "Command Reference"],	1497	$buttons->clear;
1574	[dmcommand_help => "DM Commands"],	1498
1575	[COPYING => "License Terms"],	1499	$buttons->add (new CFPlus::UI::Button
1576	[test => "test (do not select)"], #d#TODO	1500	text => "⇤",
1577	],	1501	tooltip => "back to the starting page",
1578	on_changed => sub {	1502	on_activate => sub {
1579	my ($self, $pod) = @_;	1503	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1504	unshift @future, @history;
		1505	@history = ();
		1506	$load_node->(@{shift @future});
		1507	},
		1508	);
1580		1509
1581	if ($pod eq "test") {#d#TODO	1510	if (@history) {
1582	eval {	1511	$buttons->add (new CFPlus::UI::Button
1583	load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";	1512	text => "⋘",
		1513	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1514	on_activate => sub {
		1515	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1516	$load_node->(@{pop @history});
1584	};	1517	},
1585	warn "$@" if $@;	1518	);
1586	return;	1519	}
		1520
		1521	if (@future) {
		1522	$buttons->add (new CFPlus::UI::Button
		1523	text => "⋙",
		1524	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1525	on_activate => sub {
		1526	push @history, [$curnode, $viewer->current_paragraph];
		1527	$load_node->(@{shift @future});
		1528	},
		1529	);
		1530	}
		1531
		1532	$buttons->add (new CFPlus::UI::Label text => " ");
		1533
		1534	my @path = CFPlus::Pod::full_path_of $node;
		1535	pop @path; # drop current node
		1536
		1537	for my $node (@path) {
		1538	$buttons->add (new CFPlus::UI::Button
		1539	text => $node->{kw}[0],
		1540	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1541	on_activate => sub {
		1542	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1543	$load_node->($node);
		1544	},
		1545	);
		1546	$buttons->add (new CFPlus::UI::Label text => "/");
		1547	}
		1548
		1549	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1550
		1551	$curnode = $node;
		1552
		1553	$viewer->clear;
		1554	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1555	$viewer->scroll_to ($para);
		1556	};
		1557
		1558	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1559
		1560	$CFPlus::Pod::goto_document = sub {
		1561	my (@path) = @_;
		1562
		1563	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1564
		1565	$load_node->((CFPlus::Pod::find @path)[0]);
		1566	$win->show;
		1567	};
		1568
		1569	$win
		1570	}
		1571
		1572	sub open_string_query {
		1573	my ($title, $cb, $txt, $tooltip) = @_;
		1574	my $dialog = new CFPlus::UI::Toplevel
		1575	x => "center",
		1576	y => "center",
		1577	z => 50,
		1578	force_w => $WIDTH * 4/5,
		1579	title => $title;
		1580
		1581	$dialog->add (
		1582	my $e = new CFPlus::UI::Entry
		1583	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1584	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1585	tooltip => $tooltip
		1586	);
		1587
		1588	$e->grab_focus;
		1589	$e->set_text ($txt) if $txt;
		1590	$dialog->show;
		1591	}
		1592
		1593	sub open_quit_dialog {
		1594	unless ($QUIT_DIALOG) {
		1595	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1596	x => "center",
		1597	y => "center",
		1598	z => 50,
		1599	title => "Really Quit?",
		1600	on_key_down => sub {
		1601	my ($dialog, $ev) = @_;
		1602	$ev->{sym} == 27 and $dialog->hide;
1587	}	1603	}
		1604	;
1588		1605
1589	my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",	1606	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1590	doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1591		1607
1592	#use Data::Dumper; warn Dumper $pom;#d#	1608	$vb->add (new CFPlus::UI::Label
		1609	text => "You should find a savebed and apply it first!",
		1610	max_w => $WIDTH * 0.25,
		1611	ellipsize => 0,
		1612	);
		1613	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1614	$hb->add (new CFPlus::UI::Button
		1615	text => "Ok",
		1616	expand => 1,
		1617	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1618	);
		1619	$hb->add (new CFPlus::UI::Button
		1620	text => "Quit anyway",
		1621	expand => 1,
		1622	on_activate => sub { exit },
		1623	);
		1624	}
1593		1625
1594	$viewer->clear;	1626	$QUIT_DIALOG->show;
		1627	$QUIT_DIALOG->grab_focus;
		1628	}
1595		1629
1596	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",	1630	sub show_tip_of_the_day {
1597	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),	1631	# find all tips
1598	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),	1632	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1599	# ]);#d#	1633
		1634	CFPlus::DB::get state => "tip_of_the_day", sub {
		1635	my ($todindex) = @_;
		1636	$todindex = 0 if $todindex >= @tod;
		1637	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
		1638
		1639	# create dialog
		1640	my $dialog;
		1641
		1642	my $close = sub {
		1643	$dialog->destroy;
		1644	};
		1645
		1646	$dialog = new CFPlus::UI::Toplevel
		1647	x => "center",
		1648	y => "center",
		1649	z => 3,
		1650	name => 'tip_of_the_day',
		1651	force_w => int $WIDTH * 4/9,
		1652	force_h => int $WIDTH * 2/9,
		1653	title => "Tip of the day #" . (1 + $todindex),
		1654	child => my $vbox = new CFPlus::UI::VBox,
		1655	has_close_button => 1,
		1656	on_delete => $close,
		1657	;
		1658
		1659	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1660	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1661	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1662
		1663	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1664
		1665	$table->add (0, 0, new CFPlus::UI::Button
		1666	text => "Close",
		1667	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>.",
		1668	on_activate => $close,
		1669	);
		1670
		1671	$table->add (2, 0, new CFPlus::UI::Button
		1672	text => "Next",
		1673	tooltip => "Show the next <b>Tip of the day</b>.",
		1674	on_activate => sub {
		1675	$close->();
		1676	&show_tip_of_the_day;
1600		1677	},
1601	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1602	for @$pom;
1603
1604	$viewer->set_offset (0);
1605
1606	0
1607	},	1678	);
1608	on_visibility_change => sub {	1679
1609	my ($self, $visible) = @_;	1680	$dialog->show;
1610	return unless $visible;
1611	return if $self->{value};
1612	$self->set_value ("intro");
1613	0
1614	},
1615	);	1681	};
1616
1617	$win
1618	}	1682	}
1619		1683
1620	sub sdl_init {	1684	sub sdl_init {
1621	CFClient::SDL_Init	1685	CFPlus::SDL_Init
1622	and die "SDL::Init failed!\n";	1686	and die "SDL::Init failed!\n";
1623	}	1687	}
1624		1688
1625	sub video_init {	1689	sub video_init {
1626	sdl_init;	1690	sdl_init;
…		…
1631		1695
1632	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1696	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1633	$FULLSCREEN = $CFG->{fullscreen};	1697	$FULLSCREEN = $CFG->{fullscreen};
1634	$FAST = $CFG->{fast};	1698	$FAST = $CFG->{fast};
1635		1699
1636	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1700	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1637	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1701	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1638		1702
1639	$SDL_ACTIVE = 1;	1703	$SDL_ACTIVE = 1;
1640	$LAST_REFRESH = time - 0.01;	1704	$LAST_REFRESH = time - 0.01;
1641		1705
1642	CFClient::OpenGL::init;	1706	CFPlus::OpenGL::init;
1643		1707
1644	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1708	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1645		1709
1646	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1710	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1647		1711
1648	#############################################################################	1712	#############################################################################
1649		1713
1650	if ($DEBUG_STATUS) {	1714	if ($DEBUG_STATUS) {
1651	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1715	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1652	} else {	1716	} else {
1653	# create the widgets	1717	# create the widgets
1654		1718
1655	$DEBUG_STATUS = new CFClient::UI::Label	1719	$DEBUG_STATUS = new CFPlus::UI::Label
1656	padding => 0,	1720	padding => 0,
1657	z => 100,	1721	z => 100,
1658	force_x => "max",	1722	force_x => "max",
1659	force_y => 0;	1723	force_y => 0;
1660	$DEBUG_STATUS->show;	1724	$DEBUG_STATUS->show;
1661		1725
1662	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1663
1664	$STATUSBOX = new CFClient::UI::Statusbox;	1726	$STATUSBOX = new CFPlus::UI::Statusbox;
1665	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1727	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1666		1728
1667	(new CFClient::UI::Frame	1729	(new CFPlus::UI::Frame
1668	bg => [0, 0, 0, 0.4],	1730	bg => [0, 0, 0, 0.4],
1669	force_x => 0,	1731	force_x => 0,
1670	force_y => "max",	1732	force_y => "max",
1671	child => $STATUSBOX,	1733	child => $STATUSBOX,
1672	)->show;	1734	)->show;
1673		1735
1674	CFClient::UI::FancyFrame->new (	1736	CFPlus::UI::Toplevel->new (
1675	title => "Map",	1737	title => "Map",
1676	name => "mapmap",	1738	name => "mapmap",
1677	x => 0,	1739	x => 0,
1678	y => $FONTSIZE + 8,	1740	y => $FONTSIZE + 8,
1679	border_bg => [1, 1, 1, 192/255],	1741	border_bg => [1, 1, 1, 192/255],
1680	bg => [1, 1, 1, 0],	1742	bg => [1, 1, 1, 0],
1681	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1743	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1682	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1744	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1683	),	1745	),
1684	)->show;	1746	)->show;
1685		1747
1686	$MAPWIDGET = new CFClient::MapWidget;	1748	$MAPWIDGET = new CFPlus::MapWidget;
1687	$MAPWIDGET->connect (activate_console => sub {	1749	$MAPWIDGET->connect (activate_console => sub {
1688	my ($mapwidget, $preset) = @_;	1750	my ($mapwidget, $preset) = @_;
1689		1751
1690	if ($CONSOLE) {	1752	if ($CONSOLE) {
1691	$CONSOLE->{input}->{auto_activated} = 1;	1753	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1697	}	1759	}
1698	});	1760	});
1699	$MAPWIDGET->show;	1761	$MAPWIDGET->show;
1700	$MAPWIDGET->grab_focus;	1762	$MAPWIDGET->grab_focus;
1701		1763
1702	$LOGVIEW = new CFClient::UI::TextScroller	1764	$LOGVIEW = new CFPlus::UI::TextScroller
1703	expand => 1,	1765	expand => 1,
1704	font => $FONT_FIXED,	1766	font => $FONT_FIXED,
1705	fontsize => $::CFG->{log_fontsize},	1767	fontsize => $::CFG->{log_fontsize},
1706	indent => -4,	1768	indent => -4,
1707	can_hover => 1,	1769	can_hover => 1,
1708	can_events => 1,	1770	can_events => 1,
		1771	max_par => $CFG->{logview_max_par},
1709	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1772	tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1710	;	1773	;
1711		1774
1712	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1775	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1713	title => "Setup",	1776	title => "Setup",
1714	name => "setup_dialog",	1777	name => "setup_dialog",
1715	x => 'center',	1778	x => 'center',
1716	y => 'center',	1779	y => 'center',
1717	z => 2,	1780	z => 2,
…		…
1720	has_close_button => 1,	1783	has_close_button => 1,
1721	;	1784	;
1722		1785
1723	$METASERVER = metaserver_dialog;	1786	$METASERVER = metaserver_dialog;
1724		1787
1725	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1788	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1726	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1789	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1727		1790
1728	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1791	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1729	"Configure the server to play on, your username, password and other server-related options.");	1792	"Configure the server to play on, your username, password and other server-related options.");
		1793	$SETUP_NOTEBOOK->add (Client => client_setup,
		1794	"Configure various client-specific settings.");
1730	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1795	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1731	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1796	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1732	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1797	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1733	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1798	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1734	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1799	$SETUP_NOTEBOOK->add (Audio => audio_setup,
…		…
1741	. "After pressing the combo the binding will be saved automatically and the "	1806	. "After pressing the combo the binding will be saved automatically and the "
1742	. "binding editor closes");	1807	. "binding editor closes");
1743	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1808	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1744	"Some debuggin' options. Do not ask.");	1809	"Some debuggin' options. Do not ask.");
1745		1810
1746	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1811	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1747		1812
1748	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1813	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1749	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1814	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1750		1815
1751	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1816	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1752	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1817	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1753		1818
1754	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	1819	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
1755		1820
1756	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1821	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1757	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	1822	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1758		1823
1759	$BUTTONBAR->add (new CFClient::UI::Button	1824	$BUTTONBAR->add (new CFPlus::UI::Button
1760	text => "Save Config",	1825	text => "Save Config",
1761	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1826	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1762	on_activate => sub {	1827	on_activate => sub {
1763	$::CFG->{layout} = CFClient::UI::get_layout;	1828	$::CFG->{layout} = CFPlus::UI::get_layout;
1764	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1829	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1765	status "Configuration Saved";	1830	status "Configuration Saved";
1766	0	1831	0
1767	},	1832	},
1768	);	1833	);
1769		1834
1770	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1835	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1771	tooltip => "View Documentation");	1836	tooltip => "View Documentation");
1772		1837
		1838
1773	$BUTTONBAR->add (new CFClient::UI::Button	1839	$BUTTONBAR->add (new CFPlus::UI::Button
1774	text => "Quit",	1840	text => "Quit",
1775	tooltip => "Terminates the program",	1841	tooltip => "Terminates the program",
1776	on_activate => sub {	1842	on_activate => sub {
1777	if ($CONN) {	1843	if ($CONN) {
1778	open_quit_dialog;	1844	open_quit_dialog;
…		…
1788	}	1854	}
1789		1855
1790	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1856	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1791	}	1857	}
1792		1858
		1859	sub setup_build_button {
		1860	my ($enabled) = @_;
		1861	if ($enabled) {
		1862	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1863	$BUILD_BUTTON ||= new CFPlus::UI::Button
		1864	text => "Build",
		1865	tooltip => "Opens the ingame builder",
		1866	on_activate => sub {
		1867	if ($CONN) {
		1868	$CONN->send_ext_req (builder_player_items => sub {
		1869	open_ingame_editor ($_[0]) if exists $_[0]->{items};
		1870	});
		1871	}
		1872	0
		1873	};
		1874	$BUTTONBAR->add ($BUILD_BUTTON);
		1875	} else {
		1876	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1877	}
		1878	}
		1879
		1880	sub open_ingame_editor {
		1881	my ($msg) = @_;
		1882
		1883	my $win = new CFPlus::UI::Toplevel
		1884	x => 0,
		1885	y => 'center',
		1886	z => 4,
		1887	name => 'builder_window',
		1888	force_w => int $WIDTH * 1/4,
		1889	force_h => int $HEIGHT * 3/4,
		1890	title => "In game builder",
		1891	has_close_button => 1;
		1892
		1893	my $r = new CFPlus::UI::ScrolledWindow (
		1894	expand => 1,
		1895	scroll_y => 1
		1896	);
		1897	$r->add (my $vb = new CFPlus::UI::VBox);
		1898	$win->add ($r);
		1899
		1900
		1901	$vb->add (
		1902	new CFPlus::UI::Button
		1903	text => "Disable build mode",
		1904	on_activate => sub { $::IN_BUILD_MODE = undef }
		1905	);
		1906	$vb->add (
		1907	new CFPlus::UI::Button
		1908	text => "ERASE",
		1909	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
		1910	);
		1911
		1912	for my $itemarchname (
		1913	sort {
		1914	$msg->{items}->{$a}->{build_arch_name}
		1915	cmp $msg->{items}->{$b}->{build_arch_name}
		1916	} keys %{$msg->{items}}
		1917	) {
		1918	my $info = $msg->{items}->{$itemarchname};
		1919	$vb->add (
		1920	new CFPlus::UI::Button text => $info->{build_arch_name},
		1921	on_activate => sub {
		1922	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
		1923
		1924	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
		1925	build_mode_query_arch_info ();
		1926	}
		1927	}
		1928	);
		1929	}
		1930
		1931	$win->show;
		1932	}
		1933
		1934	sub build_mode_query_arch_info {
		1935	my ($iteminfo) = $::IN_BUILD_MODE;
		1936	my $itemarchname = $iteminfo->{item};
		1937	my $info = $iteminfo->{info};
		1938
		1939	my $dialog = new CFPlus::UI::Toplevel
		1940	x => "center",
		1941	y => "center",
		1942	z => 50,
		1943	force_w => int $WIDTH * 1/2,
		1944	title => "Enter information for placement of '$itemarchname'",
		1945	has_close_button => 1;
		1946
		1947	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1948
		1949	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
		1950	my $row = 0;
		1951	if ($info->{has_name}) {
		1952	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
		1953	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
		1954	}
		1955	if ($info->{has_text}) {
		1956	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
		1957	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
		1958	}
		1959	if ($info->{has_connection}) {
		1960	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
		1961	$table->add (1, $row++,
		1962	new CFPlus::UI::Entry
		1963	expand => 1,
		1964	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
		1965	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
		1966	);
		1967	}
		1968
		1969	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1970	$hb->add (new CFPlus::UI::Button
		1971	text => "Close",
		1972	expand => 1,
		1973	on_activate => sub { $dialog->hide; 0 },
		1974	);
		1975	$dialog->show;
		1976	}
		1977
1793	sub video_shutdown {	1978	sub video_shutdown {
1794	CFClient::OpenGL::shutdown;	1979	CFPlus::OpenGL::shutdown;
1795		1980
1796	undef $SDL_ACTIVE;	1981	undef $SDL_ACTIVE;
1797	}	1982	}
1798		1983
1799	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1984	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
…		…
1807		1992
1808	sub audio_music_finished {	1993	sub audio_music_finished {
1809	return unless $CFG->{bgm_enable};	1994	return unless $CFG->{bgm_enable};
1810		1995
1811	# TODO: hack, do play loop and mood music	1996	# TODO: hack, do play loop and mood music
1812	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1997	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1813	$bgmusic->play (0);	1998	$bgmusic->play (0);
1814		1999
1815	push @bgmusic, shift @bgmusic;	2000	push @bgmusic, shift @bgmusic;
1816	}	2001	}
1817		2002
1818	sub audio_init {	2003	sub audio_init {
1819	if ($CFG->{audio_enable}) {	2004	if ($CFG->{audio_enable}) {
1820	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	2005	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1821	$SDL_MIXER = !CFClient::Mix_OpenAudio;	2006	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1822		2007
1823	unless ($SDL_MIXER) {	2008	unless ($SDL_MIXER) {
1824	status "Unable to open sound device: there will be no sound";	2009	status "Unable to open sound device: there will be no sound";
1825	return;	2010	return;
1826	}	2011	}
1827		2012
1828	CFClient::Mix_AllocateChannels 8;	2013	CFPlus::Mix_AllocateChannels 8;
1829	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	2014	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1830		2015
1831	audio_music_finished;	2016	audio_music_finished;
1832		2017
		2018	local $_;
1833	while (<$fh>) {	2019	while (<$fh>) {
1834	next if /^\s*#/;	2020	next if /^\s*#/;
1835	next if /^\s*$/;	2021	next if /^\s*$/;
1836		2022
1837	my ($file, $volume, $event) = split /\s+/, $_, 3;	2023	my ($file, $volume, $event) = split /\s+/, $_, 3;
1838		2024
1839	push @SOUNDS, "$volume,$file";	2025	push @SOUNDS, "$volume,$file";
1840		2026
1841	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	2027	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1842	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	2028	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1843	$chunk->volume ($volume * 128 / 100);	2029	$chunk->volume ($volume * 128 / 100);
1844	$chunk	2030	$chunk
1845	};	2031	};
1846	}	2032	}
1847	} else {	2033	} else {
…		…
1849	}	2035	}
1850	}	2036	}
1851	}	2037	}
1852		2038
1853	sub audio_shutdown {	2039	sub audio_shutdown {
1854	CFClient::Mix_CloseAudio if $SDL_MIXER;	2040	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1855	undef $SDL_MIXER;	2041	undef $SDL_MIXER;
1856	@SOUNDS = ();	2042	@SOUNDS = ();
1857	%AUDIO_CHUNKS = ();	2043	%AUDIO_CHUNKS = ();
1858	}	2044	}
1859		2045
…		…
1866		2052
1867	sub force_refresh {	2053	sub force_refresh {
1868	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2054	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1869	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2055	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1870		2056
1871	$CFClient::UI::ROOT->draw;	2057	$CFPlus::UI::ROOT->draw;
1872		2058
1873	$WANT_REFRESH = 0;	2059	$WANT_REFRESH = 0;
1874	$CAN_REFRESH = 0;	2060	$CAN_REFRESH = 0;
1875	$LAST_REFRESH = $NOW;	2061	$LAST_REFRESH = $NOW;
1876		2062
1877	CFClient::SDL_GL_SwapBuffers;	2063	CFPlus::SDL_GL_SwapBuffers;
1878	}	2064	}
1879		2065
1880	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2066	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1881	$NOW = time;	2067	$NOW = time;
1882		2068
1883	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2069	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1884	for CFClient::SDL_PollEvent;	2070	for CFPlus::SDL_PollEvent;
1885		2071
1886	if (%animate_object) {	2072	if (%animate_object) {
1887	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2073	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1888	$WANT_REFRESH++;	2074	$WANT_REFRESH++;
1889	}	2075	}
…		…
1913	$CONN->face_prefetch	2099	$CONN->face_prefetch
1914	if $CONN;	2100	if $CONN;
1915	});	2101	});
1916		2102
1917	%SDL_CB = (	2103	%SDL_CB = (
1918	CFClient::SDL_QUIT => sub {	2104	CFPlus::SDL_QUIT => sub {
1919	Event::unloop -1;	2105	exit;
1920	},	2106	},
1921	CFClient::SDL_VIDEORESIZE => sub {	2107	CFPlus::SDL_VIDEORESIZE => sub {
1922	},	2108	},
1923	CFClient::SDL_VIDEOEXPOSE => sub {	2109	CFPlus::SDL_VIDEOEXPOSE => sub {
1924	CFClient::UI::full_refresh;	2110	CFPlus::UI::full_refresh;
1925	},	2111	},
1926	CFClient::SDL_ACTIVEEVENT => sub {	2112	CFPlus::SDL_ACTIVEEVENT => sub {
1927	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2113	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2114	# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
		2115	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2116	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2117	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1928	},	2118	},
1929	CFClient::SDL_KEYDOWN => sub {	2119	CFPlus::SDL_KEYDOWN => sub {
1930	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2120	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1931	# alt-enter	2121	# alt-enter
1932	$FULLSCREEN_ENABLE->toggle;	2122	$FULLSCREEN_ENABLE->toggle;
1933	video_shutdown;	2123	video_shutdown;
1934	video_init;	2124	video_init;
1935	} else {	2125	} else {
1936	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2126	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1937	}	2127	}
1938	},	2128	},
1939	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2129	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1940	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2130	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1941	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2131	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1942	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2132	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1943	CFClient::SDL_USEREVENT => sub {	2133	CFPlus::SDL_USEREVENT => sub {
1944	if ($_[0]{code} == 1) {	2134	if ($_[0]{code} == 1) {
1945	audio_channel_finished $_[0]{data1};	2135	audio_channel_finished $_[0]{data1};
1946	} elsif ($_[0]{code} == 0) {	2136	} elsif ($_[0]{code} == 0) {
1947	audio_music_finished;	2137	audio_music_finished;
1948	}	2138	}
…		…
1952	#############################################################################	2142	#############################################################################
1953		2143
1954	$SIG{INT} = $SIG{TERM} = sub { exit };	2144	$SIG{INT} = $SIG{TERM} = sub { exit };
1955		2145
1956	{	2146	{
1957	local $SIG{__DIE__} = sub {
1958	return unless defined $^S && !$^S;
1959	Carp::confess $_[0];#d#TODO: remove when stable
1960	CFClient::fatal $_[0];
1961	};
1962
1963	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2147	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2148	CFPlus::DB::Server::run;
		2149
1964	CFClient::UI::set_layout ($::CFG->{layout});	2150	CFPlus::UI::set_layout ($::CFG->{layout});
1965		2151
1966	my %DEF_CFG = (	2152	my %DEF_CFG = (
1967	sdl_mode => 0,	2153	sdl_mode => 0,
1968	width => 640,	2154	width => 640,
1969	height => 480,	2155	height => 480,
1970	fullscreen => 0,	2156	fullscreen => 0,
1971	fast => 0,	2157	fast => 0,
1972	map_scale => 1,	2158	map_scale => 1,
1973	fow_enable => 1,	2159	fow_enable => 1,
1974	fow_intensity => 0.45,	2160	fow_intensity => 0.45,
1975	fow_smooth => 0,	2161	fow_smooth => 0,
		2162	map_smoothing => 1,
1976	gui_fontsize => 1,	2163	gui_fontsize => 1,
1977	log_fontsize => 0.7,	2164	log_fontsize => 0.7,
1978	gauge_fontsize => 1,	2165	gauge_fontsize => 1,
1979	gauge_size => 0.35,	2166	gauge_size => 0.35,
1980	stat_fontsize => 0.7,	2167	stat_fontsize => 0.7,
1981	mapsize => 100,	2168	mapsize => 100,
1982	say_command => 'say',	2169	say_command => 'chat',
1983	audio_enable => 1,	2170	audio_enable => 1,
1984	bgm_enable => 1,	2171	bgm_enable => 1,
1985	bgm_volume => 0.25,	2172	bgm_volume => 0.25,
1986	face_prefetch => 0,	2173	face_prefetch => 0,
1987	output_sync => 1,	2174	output_sync => 1,
1988	output_count => 1,	2175	output_count => 1,
		2176	output_rate => "",
1989	pickup => 0,	2177	pickup => 0,
		2178	inv_sort => "mtime",
1990	default => "profile", # default profile	2179	default => "profile", # default profile
		2180	show_tips => 1,
		2181	logview_max_par => 1000,
1991	);	2182	);
1992		2183
1993	while (my ($k, $v) = each %DEF_CFG) {	2184	while (my ($k, $v) = each %DEF_CFG) {
1994	$CFG->{$k} = $v unless exists $CFG->{$k};	2185	$CFG->{$k} = $v unless exists $CFG->{$k};
1995	}	2186	}
1996		2187
1997	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";	2188	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2189	$PROFILE = $CFG->{profile}{default};
		2190
		2191	# convert old bindings (only default profile matters)
		2192	if (my $bindings = delete $PROFILE->{bindings}) {
		2193	while (my ($mod, $syms) = each %$bindings) {
		2194	while (my ($sym, $cmds) = each %$syms) {
		2195	push @{ $PROFILE->{macro} }, {
		2196	accelkey => [$mod*1, $sym*1],
		2197	action => $cmds,
		2198	};
		2199	}
		2200	}
		2201	}
1998		2202
1999	sdl_init;	2203	sdl_init;
2000		2204
2001	@SDL_MODES = reverse	2205	@SDL_MODES = reverse
2002	grep $_->[0] >= 640 && $_->[1] >= 480,	2206	grep $_->[0] >= 640 && $_->[1] >= 480,
2003	CFClient::SDL_ListModes;	2207	CFPlus::SDL_ListModes;
2004		2208
2005	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2209	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2006		2210
2007	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2211	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2008		2212
2009	{	2213	{
2010	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2214	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2011	DejaVuSans.ttf	2215	DejaVuSans.ttf
2012	DejaVuSansMono.ttf	2216	DejaVuSansMono.ttf
2013	DejaVuSans-Bold.ttf	2217	DejaVuSans-Bold.ttf
2014	DejaVuSansMono-Bold.ttf	2218	DejaVuSansMono-Bold.ttf
2015	DejaVuSans-Oblique.ttf	2219	DejaVuSans-Oblique.ttf
2016	DejaVuSansMono-Oblique.ttf	2220	DejaVuSansMono-Oblique.ttf
2017	DejaVuSans-BoldOblique.ttf	2221	DejaVuSans-BoldOblique.ttf
2018	DejaVuSansMono-BoldOblique.ttf	2222	DejaVuSansMono-BoldOblique.ttf
2019	);	2223	);
2020		2224
2021	CFClient::add_font $_ for @fonts;	2225	CFPlus::add_font $_ for @fonts;
2022		2226
2023	CFClient::pango_init;	2227	CFPlus::pango_init;
2024		2228
2025	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2229	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2026	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2230	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2027		2231
2028	$FONT_PROP->make_default;	2232	$FONT_PROP->make_default;
2029	}	2233	}
2030		2234
2031	# compare mono (ft) vs. rgba (cairo)	2235	# compare mono (ft) vs. rgba (cairo)
2032	# ft - 1.8s, cairo 3s, even in alpha-only mode	2236	# ft - 1.8s, cairo 3s, even in alpha-only mode
2033	# for my $rgba (0..1) {	2237	# for my $rgba (0..1) {
2034	# my $t1 = Time::HiRes::time;	2238	# my $t1 = Time::HiRes::time;
2035	# for (1..1000) {	2239	# for (1..1000) {
2036	# my $layout = CFClient::Layout->new ($rgba);	2240	# my $layout = CFPlus::Layout->new ($rgba);
2037	# $layout->set_text ("hallo" x 100);	2241	# $layout->set_text ("hallo" x 100);
2038	# $layout->render;	2242	# $layout->render;
2039	# }	2243	# }
2040	# my $t2 = Time::HiRes::time;	2244	# my $t2 = Time::HiRes::time;
2041	# warn $t2-$t1;	2245	# warn $t2-$t1;
2042	# }	2246	# }
2043		2247
		2248	$startup_done->();
		2249
2044	video_init;	2250	video_init;
2045	audio_init;	2251	audio_init;
2046	}	2252	}
2047		2253
		2254	show_tip_of_the_day if $CFG->{show_tips};
		2255
2048	Event::loop;	2256	Event::loop;
2049	#CFClient::SDL_Quit;	2257	#CFPlus::SDL_Quit;
2050	#CFClient::_exit 0;	2258	#CFPlus::_exit 0;
2051		2259
2052	END { CFClient::SDL_Quit }	2260	END {
		2261	CFPlus::SDL_Quit;
		2262	CFPlus::DB::Server::stop;
		2263	}
2053		2264
2054	=head1 NAME	2265	=head1 NAME
2055		2266
2056	cfplus - A Crossfire+ and Crossfire game client	2267	cfplus - A Crossfire+ and Crossfire game client
2057		2268

Diff Legend

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