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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

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