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

Diff Legend

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