ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.134 by elmex, Mon Dec 4 15:17:14 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::Combobox	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	}
…		…
667		688
668	$table	689	$table
669	}	690	}
670		691
671	sub stats_window {	692	sub stats_window {
672	my $r = new CFClient::UI::ScrolledWindow (	693	my $r = new CFPlus::UI::ScrolledWindow (
673	expand => 1,	694	expand => 1,
674	scroll_y => 1	695	scroll_y => 1
675	);	696	);
676	$r->add (my $vb = new CFClient::UI::VBox);	697	$r->add (my $vb = new CFPlus::UI::VBox);
677		698
		699	$vb->add (new CFPlus::UI::FancyFrame
		700	label => "Player",
		701	child => (my $pi = new CFPlus::UI::VBox),
		702	);
		703
678	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	704	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679	can_hover => 1, can_events => 1,	705	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.");	706	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,	707	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682	can_hover => 1, can_events => 1,	708	can_hover => 1, can_events => 1,
683	tooltip => "The map you are currently on (if supported by the server).");	709	tooltip => "The map you are currently on (if supported by the server).");
684		710
685	$vb->add (my $hb0 = new CFClient::UI::HBox);	711	$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,	712	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687	can_hover => 1, can_events => 1,	713	can_hover => 1, can_events => 1,
688	tooltip => "The weight of the player including all inventory items.");	714	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,	715	$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,	716	can_hover => 1, can_events => 1,
691	tooltip => "The weight limit: you cannot carry more than this.");	717	tooltip => "The weight limit: you cannot carry more than this.");
692		718
693		719	$vb->add (new CFPlus::UI::FancyFrame
		720	label => "Primary/Secondary Statistics",
694	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	721	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		722	);
695	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	723	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
696		724
697	my $color2 = [1, 1, 0];	725	my $color2 = [1, 1, 0];
698		726
699	for (	727	for (
700	[0, 0, st_str => "Str", 30],	728	[0, 0, st_str => "Str", 30],
…		…
712	[2, 4, st_spd => "Spd", 10.54],	740	[2, 4, st_spd => "Spd", 10.54],
713	[2, 5, st_wspd => "WSp", 10.54],	741	[2, 5, st_wspd => "WSp", 10.54],
714	) {	742	) {
715	my ($col, $row, $id, $label, $template) = @$_;	743	my ($col, $row, $id, $label, $template) = @$_;
716		744
717	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	745	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
718	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	746	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	747	align => +1, template => $template, tooltip => "#stat_$label");
720	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	748	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
721	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	749	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
722	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	750	align => -1, text => $label, tooltip => "#stat_$label");
723	}	751	}
724		752
		753	$vb->add (new CFPlus::UI::FancyFrame
		754	label => "Resistancies",
725	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	755	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		756	);
726		757
727	my $row = 0;	758	my $row = 0;
728	my $col = 0;	759	my $col = 0;
729		760
730	my %resist_names = (	761	my %resist_names = (
…		…
769	drain acid pois para deat phys	800	drain acid pois para deat phys
770	blind fear tund elec cold ghit/)	801	blind fear tund elec cold ghit/)
771	{	802	{
772	$tbl2->add ($col, $row,	803	$tbl2->add ($col, $row,
773	$STATWIDS->{"res_$_"} =	804	$STATWIDS->{"res_$_"} =
774	new CFClient::UI::Label	805	new CFPlus::UI::Label
775	font => $FONT_FIXED,	806	font => $FONT_FIXED,
776	template => "-100%",	807	template => "-100%",
777	align => +1,	808	align => +1,
778	valign => 0,	809	valign => 0,
779	can_events => 1,	810	can_events => 1,
780	can_hover => 1,	811	can_hover => 1,
781	tooltip => $resist_names{$_}->[1],	812	tooltip => $resist_names{$_}->[1],
782	);	813	);
783	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	814	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
784	font => $FONT_FIXED,	815	font => $FONT_FIXED,
785	can_hover => 1,	816	can_hover => 1,
786	can_events => 1,	817	can_events => 1,
787	path => "ui/resist/resist_$_.png",	818	path => "ui/resist/resist_$_.png",
788	tooltip => $resist_names{$_}->[1],	819	tooltip => $resist_names{$_}->[1],
789	);	820	);
790	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	821	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
791	text => $resist_names{$_}->[0],	822	text => $resist_names{$_}->[0],
792	font => $FONT_FIXED,	823	font => $FONT_FIXED,
793	can_hover => 1,	824	can_hover => 1,
794	can_events => 1,	825	can_events => 1,
795	tooltip => $resist_names{$_}->[1],	826	tooltip => $resist_names{$_}->[1],
…		…
806		837
807	$r	838	$r
808	}	839	}
809		840
810	sub skill_window {	841	sub skill_window {
811	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	842	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
812	$sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);	843	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
813	$sw	844	$sw
814	}	845	}
815		846
816	sub formsep($) {	847	sub formsep($) {
817	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	848	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
828	return if $METASERVER_ATIME > time;	859	return if $METASERVER_ATIME > time;
829	$METASERVER_ATIME = time + 60;	860	$METASERVER_ATIME = time + 60;
830		861
831	my $table = $METASERVER->{table};	862	my $table = $METASERVER->{table};
832	$table->clear;	863	$table->clear;
833	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	864	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834		865
835	my $buf;	866	my $ok = 0;
836		867
837	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	868	CFPlus::background {
		869	my $ua = CFPlus::lwp_useragent;
838		870
839	unless ($fh) {	871	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840	$label->set_text ("unable to contact metaserver: $!");	872	} sub {
841	return;	873	my ($msg) = @_;
842	}	874	if ($msg) {
843
844	Event->io (fd => $fh, poll => 'r', cb => sub {
845	my $res = sysread $fh, $buf, 8192, length $buf;
846
847	if (!defined $res) {
848	$_[0]->w->cancel;
849	$label->set_text ("error while retrieving server list: $!");
850	} elsif ($res == 0) {
851	$_[0]->w->cancel;
852	status "server list retrieved";
853
854	utf8::decode $buf if utf8::valid $buf;
855
856	$table->clear;	875	$table->clear;
857		876
858	my @tip = (	877	my @tip = (
859	"The current number of users logged in on the server.",	878	"The current number of users logged in on the server.",
860	"The hostname of the server.",	879	"The hostname of the server.",
861	"The time this server has been running without being restarted.",	880	"The time this server has been running without being restarted.",
862	"The server software version - a '+' indicates a Crossfire+ server.",	881	"The server software version - a '+' indicates a Crossfire+ server.",
863	"Short information about this server provided by its admins.",	882	"Short information about this server provided by its admins.",
864	);	883	);
865	my @col = qw(#Users Host Uptime Version Description);	884	my @col = qw(#Users Host Uptime Version Description);
866	$table->add ($_, 0, new CFClient::UI::Label	885	$table->add ($_, 0, new CFPlus::UI::Label
867	can_hover => 1, can_events => 1,	886	can_hover => 1, can_events => 1,
868	align => 0, fg => [1, 1, 0],	887	align => 0, fg => [1, 1, 0],
869	text => $col[$_], tooltip => $tip[$_])	888	text => $col[$_], tooltip => $tip[$_])
870	for 0 .. $#col;	889	for 0 .. $#col;
871		890
872	my @align = qw(1 0 1 1 -1);	891	my @align = qw(1 0 1 1 -1);
873		892
874	my $y = 0;	893	my $y = 0;
875	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	894	for my $m (
		895	sort {
		896	$b->{version} <=> $a->{version}
		897	or $b->{users} <=> $a->{users}
		898	}
		899	@{ $msg->{servers} }
		900	) {
876	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	901	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
		902	@$m{qw(ip age hostname users version description ibytes obytes uptime)};
877		903
878	for ($desc) {	904	for ($desc) {
879	s/<br>/\n/gi;	905	s/<br>/\n/gi;
880	s/<li>/\n· /gi;	906	s/<li>/\n· /gi;
881	s/<.*?>//sgi;	907	s/<.*?>//sgi;
882	s/&/&amp;/g;	908	s/&amp;/&/g;
883	s/</&lt;/g;	909	s/&lt;/</g;
884	s/>/&gt;/g;	910	s/&gt;/>/g;
885	}	911	}
886		912
887	$uptime = sprintf "%dd %02d:%02d:%02d",	913	$uptime = sprintf "%dd %02d:%02d:%02d",
888	(int $m->[8] / 86400),	914	(int $uptime / 86400),
889	(int $m->[8] / 3600) % 24,	915	(int $uptime / 3600) % 24,
890	(int $m->[8] / 60) % 60,	916	(int $uptime / 60) % 60,
891	$m->[8] % 60;	917	$uptime % 60;
892		918
893	$m = [$users, $host, $uptime, $version, $desc];	919	$m = [$users, $host, $uptime, $version, $desc];
894		920
895	$y++;	921	$y++;
896		922
897	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	923	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
898	(new CFClient::UI::Button	924	(new CFPlus::UI::Button
899	text => "Use",	925	text => "Use",
900	tooltip => "Put this server into the <b>Host:Port</b> field",	926	tooltip => "Put this server into the <b>Host:Port</b> field",
901	on_activate => sub {	927	on_activate => sub {
902	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	928	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
903	$METASERVER->hide;	929	$METASERVER->hide;
904	0	930	0
905	},	931	},
906	),	932	),
907	(new CFClient::UI::Empty expand => 1),	933	(new CFPlus::UI::Empty expand => 1),
908	]);	934	]);
909		935
910	$table->add ($_, $y, new CFClient::UI::Label	936	$table->add ($_, $y, new CFPlus::UI::Label
		937	max_w => $::WIDTH * 0.4,
911	ellipsise => 0,	938	ellipsise => 0,
912	align => $align[$_],	939	align => $align[$_],
913	text => $m->[$_],	940	text => $m->[$_],
914	tooltip => $tip[$_],	941	tooltip => $tip[$_],
		942	fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
915	can_hover => 1,	943	can_hover => 1,
916	can_events => 1,	944	can_events => 1,
917	fontsize => 0.8)	945	fontsize => 0.8)
918	for 0 .. $#$m;	946	for 0 .. $#$m;
919	}	947	}
		948	} else {
		949	$ok or $label->set_text ("error while contacting metaserver");
920	}	950	}
921	});	951	};
		952
922	}	953	}
923		954
924	sub metaserver_dialog {	955	sub metaserver_dialog {
925	my $vbox = new CFClient::UI::VBox;	956	my $vbox = new CFPlus::UI::VBox;
926	my $table = new CFClient::UI::Table;	957	my $table = new CFPlus::UI::Table;
927	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	958	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
928		959
929	my $dialog = new CFClient::UI::FancyFrame	960	my $dialog = new CFPlus::UI::Toplevel
930	title => "Server List",	961	title => "Server List",
931	name => 'metaserver_dialog',	962	name => 'metaserver_dialog',
932	x => 'center',	963	x => 'center',
933	y => 'center',	964	y => 'center',
934	z => 3,	965	z => 3,
		966	force_w => $::WIDTH * 0.9,
935	force_h => $::HEIGHT * 0.4,	967	force_h => $::HEIGHT * 0.7,
936	child => $vbox,	968	child => $vbox,
937	has_close_button => 1,	969	has_close_button => 1,
938	table => $table,	970	table => $table,
939	on_visibility_change => sub {	971	on_visibility_change => sub {
940	update_metaserver ($_[0]) if $_[1];	972	update_metaserver ($_[0]) if $_[1];
…		…
944		976
945	$dialog	977	$dialog
946	}	978	}
947		979
948	sub server_setup {	980	sub server_setup {
949	my $vbox = new CFClient::UI::VBox;	981	my $vbox = new CFPlus::UI::VBox;
950		982
		983	$vbox->add (new CFPlus::UI::FancyFrame
		984	label => "Connection Settings",
951	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	985	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		986	);
952	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	987	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
953		988
954	{	989	{
955	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	990	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
956		991
957	$vbox->add (	992	$vbox->add (
958	$HOST_ENTRY = new CFClient::UI::Entry	993	$HOST_ENTRY = new CFPlus::UI::Entry
959	expand => 1,	994	expand => 1,
960	text => $CFG->{profile}{default}{host},	995	text => $CFG->{profile}{default}{host},
961	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	996	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
962	on_changed => sub {	997	on_changed => sub {
963	my ($self, $value) = @_;	998	my ($self, $value) = @_;
964	$CFG->{profile}{default}{host} = $value;	999	$CFG->{profile}{default}{host} = $value;
965	0	1000	0
966	}	1001	}
967	);	1002	);
968		1003
969	$vbox->add (new CFClient::UI::Button	1004	$vbox->add (new CFPlus::UI::Button
970	expand => 1,	1005	expand => 1,
971	text => "Server List",	1006	text => "Server List",
972	other => $METASERVER,	1007	other => $METASERVER,
973	tooltip => "Show a list of available crossfire servers",	1008	tooltip => "Show a list of available crossfire servers",
974	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1009	on_activate => sub { $METASERVER->toggle_visibility; 0 },
975	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1010	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
976	);	1011	);
977	}	1012	}
978		1013
979	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1014	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
980	$table->add (1, 4, new CFClient::UI::Entry	1015	$table->add (1, 4, new CFPlus::UI::Entry
981	text => $CFG->{profile}{default}{user},	1016	text => $CFG->{profile}{default}{user},
982	tooltip => "The name of your character on the server",	1017	tooltip => "The name of your character on the server",
983	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1018	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
984	);	1019	);
985		1020
986	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1021	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
987	$table->add (1, 5, new CFClient::UI::Entry	1022	$table->add (1, 5, new CFPlus::UI::Entry
988	text => $CFG->{profile}{default}{password},	1023	text => $CFG->{profile}{default}{password},
989	hidden => 1,	1024	hidden => 1,
990	tooltip => "The password for your character",	1025	tooltip => "The password for your character",
991	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1026	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
992	);	1027	);
993		1028
994	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1029	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
995	$table->add (1, 7, new CFClient::UI::Slider	1030	$table->add (1, 7, new CFPlus::UI::Slider
996	force_w => 100,	1031	force_w => 100,
997	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1032	range => [$CFG->{mapsize}, 10, 100, 0, 1],
998	tooltip => "This is the size of the portion of the map update the server sends you. "	1033	tooltip => "This is the size of the portion of the map update the server sends you. "
999	. "If you set this to a high value you will be able to see further, "	1034	. "If you set this to a high value you will be able to see further, "
1000	. "but you also increase bandwidth requirements and latency. "	1035	. "but you also increase bandwidth requirements and latency. "
1001	. "This option is only used once at log-in.",	1036	. "This option is only used once at log-in.",
1002	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1037	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1003	);	1038	);
1004		1039
1005	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1040	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006	$table->add (1, 8, new CFClient::UI::CheckBox	1041	$table->add (1, 8, new CFPlus::UI::CheckBox
1007	state => $CFG->{face_prefetch},	1042	state => $CFG->{face_prefetch},
1008	tooltip => "<b>Background Image Prefetch</b>\n\n"	1043	tooltip => "<b>Background Image Prefetch</b>\n\n"
1009	. "If enabled, the client automatically pre-fetches images from the server. "	1044	. "If enabled, the client automatically pre-fetches images from the server. "
1010	. "This might increase or create lag, but increases the chances "	1045	. "This might increase or create lag, but increases the chances "
1011	. "of faces being ready for display when you encounter them. "	1046	. "of faces being ready for display when you encounter them. "
…		…
1013	. "so only set it if you really need to prefetch images. "	1048	. "so only set it if you really need to prefetch images. "
1014	. "This option can be set and unset any time.",	1049	. "This option can be set and unset any time.",
1015	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1050	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016	);	1051	);
1017		1052
1018	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1053	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1019	$table->add (1, 9, new CFClient::UI::Entry	1054	$table->add (1, 9, new CFPlus::UI::Entry
1020	text => $CFG->{output_count},	1055	text => $CFG->{output_count},
1021	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1056	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1057	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023	);	1058	);
1024		1059
1025	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1060	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026	$table->add (1, 10, new CFClient::UI::Entry	1061	$table->add (1, 10, new CFPlus::UI::Entry
1027	text => $CFG->{output_sync},	1062	text => $CFG->{output_sync},
1028	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1063	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1064	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030	);	1065	);
1031		1066
1032	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1067	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1033	expand => 1,	1068	expand => 1,
1034	align => 0,	1069	align => 0,
1035	text => "Login",	1070	text => "Login",
1036	on_activate => sub {	1071	on_activate => sub {
1037	$CONN ? stop_game	1072	$CONN ? stop_game
1038	: start_game;	1073	: start_game;
1039	0	1074	0
1040	},	1075	},
1041	);	1076	);
1042		1077
1043	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1078	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1044	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1079	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1045	text => $CFG->{say_command},	1080	text => $CFG->{say_command},
1046	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "	1081	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1047	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1082	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1048	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1083	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1049	on_changed => sub {	1084	on_changed => sub {
1050	my ($self, $value) = @_;	1085	my ($self, $value) = @_;
1051	$CFG->{say_command} = $value;	1086	$CFG->{say_command} = $value;
1052	0	1087	0
1053	}	1088	}
1054	);	1089	);
1055		1090
		1091	$table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
		1092	$table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
		1093	state => $CFG->{show_tips},
		1094	tooltip => "Show the <b>Tip of the day</b> window at startup?",
		1095	on_changed => sub {
		1096	my ($self, $value) = @_;
		1097	$CFG->{show_tips} = $value;
		1098	0
		1099	}
		1100	);
		1101
1056	$vbox->add (new CFClient::UI::Label	1102	$vbox->add (new CFPlus::UI::FancyFrame
1057	text => "Server Info",	1103	label => "Server Info",
1058	fontsize => 1.2,
1059	padding_y => 8,
1060	fg => [1, 1, 0, 1],
1061	);
1062
1063	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);	1104	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1105	);
1064		1106
1065	$vbox	1107	$vbox
1066	}	1108	}
1067		1109
1068	sub message_window {	1110	sub message_window {
1069	my $window = new CFClient::UI::FancyFrame	1111	my $window = new CFPlus::UI::Toplevel
1070	name => "message_window",	1112	name => "message_window",
1071	title => "Messages",	1113	title => "Messages",
1072	border_bg => [1, 1, 1, 1],	1114	border_bg => [1, 1, 1, 1],
1073	x => "max",	1115	x => "max",
1074	y => 0,	1116	y => 0,
1075	force_w => $::WIDTH * 0.4,	1117	force_w => $::WIDTH * 0.4,
1076	force_h => $::HEIGHT * 0.5,	1118	force_h => $::HEIGHT * 0.5,
1077	child => (my $vbox = new CFClient::UI::VBox),	1119	child => (my $vbox = new CFPlus::UI::VBox),
1078	has_close_button => 1;	1120	has_close_button => 1;
1079		1121
1080	$vbox->add ($LOGVIEW);	1122	$vbox->add ($LOGVIEW);
1081		1123
1082	$vbox->add (my $input = new CFClient::UI::Entry	1124	$vbox->add (my $input = new CFPlus::UI::Entry
1083	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1125	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1084	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1126	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1085	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1127	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1086	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1128	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1087	on_focus_in => sub {	1129	on_focus_in => sub {
…		…
1126	};	1168	};
1127		1169
1128	$window	1170	$window
1129	}	1171	}
1130		1172
1131	sub open_quit_dialog {
1132	unless ($QUIT_DIALOG) {
1133	$QUIT_DIALOG = new CFClient::UI::FancyFrame
1134	x => "center",
1135	y => "center",
1136	z => 50,
1137	title => "Really Quit?",
1138	;
1139
1140	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1141
1142	$vb->add (new CFClient::UI::Label
1143	text => "You should find a savebed and apply it first!",
1144	max_w => $WIDTH * 0.25,
1145	ellipsize => 0,
1146	);
1147	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1148	$hb->add (new CFClient::UI::Button
1149	text => "Ok",
1150	expand => 1,
1151	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1152	);
1153	$hb->add (new CFClient::UI::Button
1154	text => "Quit anyway",
1155	expand => 1,
1156	on_activate => sub { exit },
1157	);
1158	}
1159
1160	$QUIT_DIALOG->show;
1161	}
1162
1163	sub autopickup_setup {	1173	sub autopickup_setup {
1164	my $table = new CFClient::UI::Table;	1174	my $table = new CFPlus::UI::Table;
1165		1175
1166	for (	1176	for (
1167	["General", 0, 0,	1177	["General", 0, 0,
1168	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1178	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1169	["Inhibit autopickup" => PICKUP_INHIBIT],	1179	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1183	["Boots" => PICKUP_BOOTS],	1193	["Boots" => PICKUP_BOOTS],
1184	["Gloves" => PICKUP_GLOVES],	1194	["Gloves" => PICKUP_GLOVES],
1185	["Cloaks" => PICKUP_CLOAK],	1195	["Cloaks" => PICKUP_CLOAK],
1186	],	1196	],
1187		1197
1188	["Readables", 2, 2,	1198	["Readables", 2, 0,
1189	["Spellbooks" => PICKUP_SPELLBOOK],	1199	["Spellbooks" => PICKUP_SPELLBOOK],
1190	["Skillscrolls" => PICKUP_SKILLSCROLL],	1200	["Skillscrolls" => PICKUP_SKILLSCROLL],
1191	["Normal Books/Scrolls" => PICKUP_READABLES],	1201	["Normal Books/Scrolls" => PICKUP_READABLES],
1192	],	1202	],
1193	["Misc", 2, 7,	1203	["Misc", 2, 5,
1194	["Food" => PICKUP_FOOD],	1204	["Food" => PICKUP_FOOD],
1195	["Drinks" => PICKUP_DRINK],	1205	["Drinks" => PICKUP_DRINK],
1196	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1206	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1197	["Keys" => PICKUP_KEY],	1207	["Keys" => PICKUP_KEY],
1198	["Magical Items" => PICKUP_MAGICAL],	1208	["Magical Items" => PICKUP_MAGICAL],
1199	["Potions" => PICKUP_POTION],	1209	["Potions" => PICKUP_POTION],
1200	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1210	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1201	["Ignore cursed" => PICKUP_NOT_CURSED],	1211	["Ignore cursed" => PICKUP_NOT_CURSED],
1202	["Jewelery" => PICKUP_JEWELS],	1212	["Jewelery" => PICKUP_JEWELS],
		1213	["Flesh" => PICKUP_FLESH],
1203	],	1214	],
1204	["Weight/Value ratio", 2, 17]	1215	["Weight/Value ratio", 2, 17]
1205	)	1216	)
1206	{	1217	{
1207	my ($title, $x, $y, @bits) = @$_;	1218	my ($title, $x, $y, @bits) = @$_;
1208	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1219	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1209		1220
1210	for (@bits) {	1221	for (@bits) {
1211	++$y;	1222	++$y;
1212		1223
1213	my $mask = $_->[1];	1224	my $mask = $_->[1];
1214	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1225	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1215	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1226	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1216	state => $::CFG->{pickup} & $mask,	1227	state => $::CFG->{pickup} & $mask,
1217	on_changed => sub {	1228	on_changed => sub {
1218	my ($box, $value) = @_;	1229	my ($box, $value) = @_;
1219		1230
1220	if ($value) {	1231	if ($value) {
…		…
1231		1242
1232	${$_->[2]} = $checkbox if $_->[2];	1243	${$_->[2]} = $checkbox if $_->[2];
1233	}	1244	}
1234	}	1245	}
1235		1246
1236	$table->add (2, 18, new CFClient::UI::ValSlider	1247	$table->add (2, 18, new CFPlus::UI::ValSlider
1237	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1248	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1238	template => ">= 99",	1249	template => ">= 99",
1239	to_value => sub { ">= " . 5 * $_[0] },	1250	to_value => sub { ">= " . 5 * $_[0] },
1240	on_changed => sub {	1251	on_changed => sub {
1241	my ($slider, $value) = @_;	1252	my ($slider, $value) = @_;
…		…
1244	$::CFG->{pickup} |= int $value	1255	$::CFG->{pickup} |= int $value
1245	if $value;	1256	if $value;
1246	1;	1257	1;
1247	});	1258	});
1248		1259
1249	$table->add (3, 18, new CFClient::UI::Button	1260	$table->add (3, 18, new CFPlus::UI::Button
1250	text => "set",	1261	text => "set",
1251	on_activate => sub {	1262	on_activate => sub {
1252	$::CONN->send_command ("pickup $::CFG->{pickup}")	1263	$::CONN->send_command ("pickup $::CFG->{pickup}")
1253	if defined $::CONN;	1264	if defined $::CONN;
1254	0	1265	0
1255	});	1266	});
1256		1267
1257	$table	1268	$table
1258	}	1269	}
1259		1270
		1271	my %SORT_ORDER = (
		1272	type => undef,
		1273	mtime => sub {
		1274	my $NOW = time;
		1275	sort {
		1276	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1277	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1278
		1279	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1280	or $btime <=> $atime
		1281	or $a->{type} <=> $b->{type}
		1282	} @_
		1283	},
		1284	weight => sub { sort {
		1285	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1286	or $a->{type} <=> $b->{type}
		1287	} @_ },
		1288	);
		1289
1260	sub inventory_widget {	1290	sub inventory_widget {
1261	my $hb = new CFClient::UI::HBox homogeneous => 1;	1291	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1262		1292
1263	$hb->add (my $vb1 = new CFClient::UI::VBox);	1293	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1264	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1294	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1265		1295
1266	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1296	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1267		1297
1268	use sort 'stable';	1298	use sort 'stable';
1269		1299
1270	$hb1->add (new CFClient::UI::Combobox	1300	$hb1->add (new CFPlus::UI::Selector
1271	value => undef,	1301	value => $::CFG->{inv_sort},
1272	options => [	1302	options => [
1273	[undef, "Type/Name"],	1303	[type => "Type/Name"],
1274	[	1304	[mtime => "Recent/Normal/Locked"],
1275	sub { sort {
1276	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1277	or $a->{type} <=> $b->{type}
1278	} @_ },
1279	"Weight/Type",	1305	[weight => "Weight/Type"],
1280	],
1281	[sub { } => "#TODO#"],
1282	],	1306	],
1283	on_changed => sub {	1307	on_changed => sub {
		1308	$::CFG->{inv_sort} = $_[1];
1284	$INV->set_sort_order ($_[1]);	1309	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1285	},	1310	},
1286	);	1311	);
1287	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1312	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1288	#TODO# update to weigh/maxweight	1313	#TODO# update to weigh/maxweight
1289	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1314	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1290		1315
1291	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1316	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1292	$sw1->add ($INV = new CFClient::UI::Inventory);	1317	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1318	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1293		1319
1294	$hb->add (my $vb2 = new CFClient::UI::VBox);	1320	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1295		1321
1296	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1322	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1297		1323
1298	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1324	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1299	$sw2->add ($INVR = new CFClient::UI::Inventory);	1325	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1300		1326
1301	# XXX: Call after $INVR = ... because set_opencont sets the items	1327	# XXX: Call after $INVR = ... because set_opencont sets the items
1302	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1328	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1303		1329
1304	$hb	1330	$hb
1305	}	1331	}
1306		1332
1307	sub toggle_player_page {	1333	sub toggle_player_page {
…		…
1314	$PL_WINDOW->show;	1340	$PL_WINDOW->show;
1315	}	1341	}
1316	}	1342	}
1317		1343
1318	sub player_window {	1344	sub player_window {
1319	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1345	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1320	x => "center",	1346	x => "center",
1321	y => "center",	1347	y => "center",
1322	force_w => $WIDTH * 9/10,	1348	force_w => $WIDTH * 9/10,
1323	force_h => $HEIGHT * 9/10,	1349	force_h => $HEIGHT * 9/10,
1324	title => "Player",	1350	title => "Player",
…		…
1326	has_close_button => 1	1352	has_close_button => 1
1327	;	1353	;
1328		1354
1329	my $ntb =	1355	my $ntb =
1330	$PL_NOTEBOOK =	1356	$PL_NOTEBOOK =
1331	new CFClient::UI::Notebook expand => 1, debug => 1;	1357	new CFPlus::UI::Notebook expand => 1, debug => 1;
1332		1358
1333	$ntb->add (	1359	$ntb->add (
1334	"Statistics (F2)" => $STATS_PAGE = stats_window,	1360	"Statistics (F2)" => $STATS_PAGE = stats_window,
1335	"Shows statistics, where all your Stats and Resistances are shown."	1361	"Shows statistics, where all your Stats and Resistances are shown."
1336	);	1362	);
1337	$ntb->add (	1363	$ntb->add (
1338	"Skills (F3)" => $SKILL_PAGE = skill_window,	1364	"Skills (F3)" => $SKILL_PAGE = skill_window,
1339	"Shows all your Skills."	1365	"Shows all your Skills."
1340	);	1366	);
1341		1367
1342	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1368	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1343	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1369	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1344	$ntb->add (	1370	$ntb->add (
1345	"Spellbook (F4)" => $spellsw,	1371	"Spellbook (F4)" => $spellsw,
1346	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1372	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1347	);	1373	);
1348	$ntb->add (	1374	$ntb->add (
…		…
1360	sub update_bindings {	1386	sub update_bindings {
1361	$BIND_UPD_CB->() if $BIND_UPD_CB;	1387	$BIND_UPD_CB->() if $BIND_UPD_CB;
1362	}	1388	}
1363		1389
1364	sub keyboard_setup {	1390	sub keyboard_setup {
1365	my $binding_list = new CFClient::UI::VBox;	1391	my $binding_list = new CFPlus::UI::VBox;
1366		1392
1367	my $refresh;	1393	my $refresh;
1368	$refresh = $BIND_UPD_CB = sub {	1394	$refresh = $BIND_UPD_CB = sub {
1369	$binding_list->clear ();	1395	$binding_list->clear ();
1370		1396
		1397	return unless $PROFILE;
		1398
1371	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {	1399	for my $mod (keys %{$PROFILE->{bindings}}) {
1372	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {	1400	for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1373	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1401	my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1374	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1402	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1375		1403
1376	my $lbl = join "; ", @$cmds;	1404	my $lbl = join "; ", @$cmds;
1377	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);	1405	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1378	$binding_list->add (my $hb = new CFClient::UI::HBox);	1406	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1379	$hb->add (new CFClient::UI::Button	1407	$hb->add (new CFPlus::UI::Button
1380	text => "delete",	1408	text => "delete",
1381	tooltip => "Deletes the binding",	1409	tooltip => "Deletes the binding",
1382	on_activate => sub {	1410	on_activate => sub {
1383	$binding_list->remove ($hb);	1411	$binding_list->remove ($hb);
1384	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1412	delete $PROFILE->{bindings}{$mod}{$sym};
1385	0	1413	0
1386	});	1414	});
1387		1415
1388	$hb->add (new CFClient::UI::Button	1416	$hb->add (new CFPlus::UI::Button
1389	text => "edit",	1417	text => "edit",
1390	tooltip => "Edits the binding",	1418	tooltip => "Edits the binding",
1391	on_activate => sub {	1419	on_activate => sub {
1392	$::BIND_EDITOR->set_binding (	1420	$::BIND_EDITOR->set_binding (
1393	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},	1421	$mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1394	sub {	1422	sub {
1395	my ($nmod, $nsym, $ncmds) = @_;	1423	my ($nmod, $nsym, $ncmds) = @_;
1396	$::BIND_EDITOR->cfg_unbind ($mod, $sym);	1424	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1397	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);	1425	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1398	$refresh->();	1426	$refresh->();
…		…
1406	$::BIND_EDITOR->show;	1434	$::BIND_EDITOR->show;
1407	$SETUP_DIALOG->hide;	1435	$SETUP_DIALOG->hide;
1408	0	1436	0
1409	});	1437	});
1410		1438
1411	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1439	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1412	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1440	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1413	}	1441	}
1414	}	1442	}
1415	};	1443	};
1416		1444
1417	my $vb = new CFClient::UI::VBox;	1445	my $vb = new CFPlus::UI::VBox;
1418	$vb->add (my $hb = new CFClient::UI::HBox);	1446	$vb->add (new CFPlus::UI::FancyFrame
		1447	label => "Options",
		1448	child => (my $hb = new CFPlus::UI::HBox),
		1449	);
1419	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");	1450	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1420	$hb->add (new CFClient::UI::CheckBox	1451	$hb->add (new CFPlus::UI::CheckBox
1421	expand => 1,	1452	expand => 1,
1422	state => $CFG->{shift_fire_stop},	1453	state => $CFG->{shift_fire_stop},
1423	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",	1454	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1424	on_changed => sub {	1455	on_changed => sub {
1425	my ($cbox, $value) = @_;	1456	my ($cbox, $value) = @_;
1426	$CFG->{shift_fire_stop} = $value;	1457	$CFG->{shift_fire_stop} = $value;
1427	0	1458	0
1428	});	1459	});
1429		1460
1430	$vb->add ($binding_list);	1461	$vb->add (new CFPlus::UI::FancyFrame
		1462	label => "Bindings",
		1463	child => $binding_list);
1431	$vb->add (my $hb = new CFClient::UI::HBox);	1464	$vb->add (my $hb = new CFPlus::UI::HBox);
1432		1465
1433	$hb->add (new CFClient::UI::Button	1466	$hb->add (new CFPlus::UI::Button
1434	text => "record new",	1467	text => "record new",
1435	expand => 1,	1468	expand => 1,
1436	tooltip => "This button opens the binding editor with an empty binding.",	1469	tooltip => "This button opens the binding editor with an empty binding.",
1437	on_activate => sub {	1470	on_activate => sub {
1438	$::BIND_EDITOR->set_binding (undef, undef, [],	1471	$::BIND_EDITOR->set_binding (undef, undef, [],
…		…
1452	$::BIND_EDITOR->show;	1485	$::BIND_EDITOR->show;
1453	0	1486	0
1454	},	1487	},
1455	);	1488	);
1456		1489
1457	$hb->add (new CFClient::UI::Button	1490	$hb->add (new CFPlus::UI::Button
1458	text => "close",	1491	text => "close",
1459	tooltip => "Closes the binding window",	1492	tooltip => "Closes the binding window",
1460	expand => 1,	1493	expand => 1,
1461	on_activate => sub {	1494	on_activate => sub {
1462	$SETUP_DIALOG->hide;	1495	$SETUP_DIALOG->hide;
…		…
1467	$refresh->();	1500	$refresh->();
1468		1501
1469	$vb	1502	$vb
1470	}	1503	}
1471		1504
1472	# just weirdness, pls. ignore
1473	sub load_html_page {
1474	my ($viewer, $base) = @_;
1475
1476	$viewer->clear;
1477
1478	require LWP::Simple;
1479	require HTML::Parser;
1480	require URI;
1481
1482	my $page = LWP::Simple::get ($base)
1483	or return;
1484
1485	my @s = { };
1486	my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1487
1488	my $parser = HTML::Parser->new (
1489	text_h => [sub {
1490	my ($text) = @_;
1491	$text =~ s/\s+/ /g;
1492	$s[-1]{text} .= CFClient::asxml $text;
1493	}, "dtext"],
1494	start_h => [sub {
1495	my ($tag, $attr) = @_;
1496	if ($passthrough{$tag}) {
1497	$s[-1]{text} .= "<$tag>";
1498	} elsif ($tag eq "h1") {
1499	push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1500	} elsif ($tag eq "h2") {
1501	push @s, { text => "<span foreground='#ccccff' size='large'>" };
1502	} elsif ($tag eq "h3") {
1503	push @s, { text => "<span size='large'>" };
1504	} elsif ($tag eq "a") {
1505	push @s, { text => "", url => $attr->{href} };
1506	} elsif ($tag eq "p") {
1507	push @s, { };
1508	} elsif ($tag eq "img") {
1509	eval {
1510	push @{$s[-1]{obj}}, new CFClient::UI::Image
1511	tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1512	$s[-1]{text} .= "\x{fffc}";
1513	};
1514	}
1515	}, "tagname, attr"],
1516	end_h => [sub {
1517	my ($tag) = @_;
1518	if ($passthrough{$tag}) {
1519	$s[-1]{text} .= "</$tag>";
1520	} elsif ($tag =~ /^h\d$/) {
1521	$s[-1]{text} .= "</span>";
1522	push @s, { };
1523	} elsif ($tag eq "a") {
1524	my $S = pop @s;
1525	$s[-1]{text} .= "\x{fffc}";
1526	push @{$s[-1]{obj}}, new CFClient::UI::Label
1527	fg => [0.8, 0.8, 1],
1528	markup => "<u>$S->{text}</u>",
1529	fontsize => 0.8,
1530	can_events => 1,
1531	can_focus => 1,
1532	on_button_up => sub {
1533	load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1534	},
1535	;
1536	}
1537	}, "tagname"],
1538	);
1539
1540	$parser->parse ($page);
1541	$parser->eof;
1542
1543	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1544	for @s;
1545
1546	$viewer->set_offset (0);
1547	}
1548
1549	sub help_window {	1505	sub help_window {
1550	my $win = new CFClient::UI::FancyFrame	1506	my $win = new CFPlus::UI::Toplevel
1551	x => 'center',	1507	x => 'center',
1552	y => 'center',	1508	y => 'center',
1553	z => 2,	1509	z => 4,
1554	name => 'doc_browser',	1510	name => 'doc_browser',
1555	force_w => int $WIDTH * 7/8,	1511	force_w => int $WIDTH * 7/8,
1556	force_h => int $HEIGHT * 7/8,	1512	force_h => int $HEIGHT * 7/8,
1557	title => "Help Browser",	1513	title => "Help Browser",
1558	has_close_button => 1;	1514	has_close_button => 1;
1559		1515
1560	$win->add (my $vbox = new CFClient::UI::VBox);	1516	$win->add (my $vbox = new CFPlus::UI::VBox);
1561		1517
1562	$vbox->add (my $buttons = new CFClient::UI::HBox);	1518	$vbox->add (new CFPlus::UI::FancyFrame
		1519	label => "Navigation",
		1520	child => (my $buttons = new CFPlus::UI::HBox),
		1521	);
1563	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1522	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1564	expand => 1, fontsize => 0.8, padding_x => 4);	1523	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1565		1524
1566	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1525	my @history;
1567	$buttons->add (my $combo = new CFClient::UI::Combobox	1526	my @future;
1568	value => undef,	1527	my $curnode;
1569	options => [	1528
1570	[intro => "Introduction"],	1529	my $load_node; $load_node = sub {
1571	[manual => "Main Manual"],	1530	my ($node, $para) = @_;
1572	[skill_help => "Skill Reference"],	1531
1573	[command_help => "Command Reference"],	1532	$buttons->clear;
1574	[dmcommand_help => "DM Commands"],	1533
1575	[COPYING => "License Terms"],	1534	$buttons->add (new CFPlus::UI::Button
1576	[test => "test (do not select)"], #d#TODO	1535	text => "⇤",
1577	],	1536	tooltip => "back to the starting page",
1578	on_changed => sub {	1537	on_activate => sub {
1579	my ($self, $pod) = @_;	1538	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1539	unshift @future, @history;
		1540	@history = ();
		1541	$load_node->(@{shift @future});
		1542	},
		1543	);
1580		1544
1581	if ($pod eq "test") {#d#TODO	1545	if (@history) {
1582	eval {	1546	$buttons->add (new CFPlus::UI::Button
1583	load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";	1547	text => "⋘",
		1548	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1549	on_activate => sub {
		1550	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1551	$load_node->(@{pop @history});
1584	};	1552	},
1585	warn "$@" if $@;	1553	);
1586	return;	1554	}
		1555
		1556	if (@future) {
		1557	$buttons->add (new CFPlus::UI::Button
		1558	text => "⋙",
		1559	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1560	on_activate => sub {
		1561	push @history, [$curnode, $viewer->current_paragraph];
		1562	$load_node->(@{shift @future});
		1563	},
		1564	);
		1565	}
		1566
		1567	$buttons->add (new CFPlus::UI::Label text => " ");
		1568
		1569	my @path = CFPlus::Pod::full_path_of $node;
		1570	pop @path; # drop current node
		1571
		1572	for my $node (@path) {
		1573	$buttons->add (new CFPlus::UI::Button
		1574	text => $node->{kw}[0],
		1575	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1576	on_activate => sub {
		1577	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1578	$load_node->($node);
		1579	},
		1580	);
		1581	$buttons->add (new CFPlus::UI::Label text => "/");
		1582	}
		1583
		1584	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1585
		1586	$curnode = $node;
		1587
		1588	$viewer->clear;
		1589	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1590	$viewer->scroll_to ($para);
		1591	};
		1592
		1593	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1594
		1595	$CFPlus::Pod::goto_document = sub {
		1596	my (@path) = @_;
		1597
		1598	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1599
		1600	$load_node->((CFPlus::Pod::find @path)[0]);
		1601	$win->show;
		1602	};
		1603
		1604	$win
		1605	}
		1606
		1607	sub open_string_query {
		1608	my ($title, $cb, $txt, $tooltip) = @_;
		1609	my $dialog = new CFPlus::UI::Toplevel
		1610	x => "center",
		1611	y => "center",
		1612	z => 50,
		1613	force_w => $WIDTH * 4/5,
		1614	title => $title;
		1615
		1616	$dialog->add (
		1617	my $e = new CFPlus::UI::Entry
		1618	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1619	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1620	tooltip => $tooltip
		1621	);
		1622
		1623	$e->grab_focus;
		1624	$e->set_text ($txt) if $txt;
		1625	$dialog->show;
		1626	}
		1627
		1628	sub open_quit_dialog {
		1629	unless ($QUIT_DIALOG) {
		1630	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1631	x => "center",
		1632	y => "center",
		1633	z => 50,
		1634	title => "Really Quit?",
		1635	on_key_down => sub {
		1636	my ($dialog, $ev) = @_;
		1637	$ev->{sym} == 27 and $dialog->hide;
1587	}	1638	}
1588
1589	my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1590	doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1591
1592	#use Data::Dumper; warn Dumper $pom;#d#
1593
1594	$viewer->clear;
1595
1596	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1597	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1598	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1599	# ]);#d#
1600		1639	;
1601	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1602	for @$pom;
1603		1640
1604	$viewer->set_offset (0);	1641	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1605		1642
1606	0	1643	$vb->add (new CFPlus::UI::Label
		1644	text => "You should find a savebed and apply it first!",
		1645	max_w => $WIDTH * 0.25,
		1646	ellipsize => 0,
		1647	);
		1648	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1649	$hb->add (new CFPlus::UI::Button
		1650	text => "Ok",
		1651	expand => 1,
		1652	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1653	);
		1654	$hb->add (new CFPlus::UI::Button
		1655	text => "Quit anyway",
		1656	expand => 1,
		1657	on_activate => sub { exit },
		1658	);
		1659	}
		1660
		1661	$QUIT_DIALOG->show;
		1662	$QUIT_DIALOG->grab_focus;
		1663	}
		1664
		1665	sub show_tip_of_the_day {
		1666	# find all tips
		1667	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1668
		1669	my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
		1670	$todindex = 0 if $todindex >= @tod;
		1671	$CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
		1672
		1673	# create dialog
		1674	my $dialog;
		1675
		1676	my $close = sub {
		1677	$dialog->destroy;
		1678	};
		1679
		1680	$dialog = new CFPlus::UI::Toplevel
		1681	x => "center",
		1682	y => "center",
		1683	z => 3,
		1684	name => 'tip_of_the_day',
		1685	force_w => int $WIDTH * 4/9,
		1686	force_h => int $WIDTH * 2/9,
		1687	title => "Tip of the day #" . (1 + $todindex),
		1688	child => my $vbox = new CFPlus::UI::VBox,
		1689	has_close_button => 1,
		1690	on_delete => $close,
		1691	;
		1692
		1693	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1694	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1695	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1696
		1697	$vbox->add (my $table = new CFPlus::UI::Table);
		1698
		1699	$table->add (0, 0, new CFPlus::UI::Button
		1700	text => "Close",
		1701	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>.",
		1702	on_activate => $close,
		1703	);
		1704
		1705	$table->add (2, 0, new CFPlus::UI::Button
		1706	text => "Next",
		1707	tooltip => "Show the next <b>Tip of the day</b>.",
		1708	on_activate => sub {
		1709	$close->();
		1710	&show_tip_of_the_day;
1607	},	1711	},
1608	on_visibility_change => sub {
1609	my ($self, $visible) = @_;
1610	return unless $visible;
1611	return if $self->{value};
1612	$self->set_value ("intro");
1613	0
1614	},
1615	);	1712	);
1616		1713
1617	$win	1714	$dialog->show;
1618	}	1715	}
1619		1716
1620	sub sdl_init {	1717	sub sdl_init {
1621	CFClient::SDL_Init	1718	CFPlus::SDL_Init
1622	and die "SDL::Init failed!\n";	1719	and die "SDL::Init failed!\n";
1623	}	1720	}
1624		1721
1625	sub video_init {	1722	sub video_init {
1626	sdl_init;	1723	sdl_init;
…		…
1631		1728
1632	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1729	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1633	$FULLSCREEN = $CFG->{fullscreen};	1730	$FULLSCREEN = $CFG->{fullscreen};
1634	$FAST = $CFG->{fast};	1731	$FAST = $CFG->{fast};
1635		1732
1636	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1733	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1637	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1734	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1638		1735
1639	$SDL_ACTIVE = 1;	1736	$SDL_ACTIVE = 1;
1640	$LAST_REFRESH = time - 0.01;	1737	$LAST_REFRESH = time - 0.01;
1641		1738
1642	CFClient::OpenGL::init;	1739	CFPlus::OpenGL::init;
1643		1740
1644	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1741	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1645		1742
1646	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1743	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1647		1744
1648	#############################################################################	1745	#############################################################################
1649		1746
1650	if ($DEBUG_STATUS) {	1747	if ($DEBUG_STATUS) {
1651	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1748	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1652	} else {	1749	} else {
1653	# create the widgets	1750	# create the widgets
1654		1751
1655	$DEBUG_STATUS = new CFClient::UI::Label	1752	$DEBUG_STATUS = new CFPlus::UI::Label
1656	padding => 0,	1753	padding => 0,
1657	z => 100,	1754	z => 100,
1658	force_x => "max",	1755	force_x => "max",
1659	force_y => 0;	1756	force_y => 0;
1660	$DEBUG_STATUS->show;	1757	$DEBUG_STATUS->show;
1661		1758
1662	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);	1759	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1663		1760
1664	$STATUSBOX = new CFClient::UI::Statusbox;	1761	$STATUSBOX = new CFPlus::UI::Statusbox;
1665	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1762	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1666		1763
1667	(new CFClient::UI::Frame	1764	(new CFPlus::UI::Frame
1668	bg => [0, 0, 0, 0.4],	1765	bg => [0, 0, 0, 0.4],
1669	force_x => 0,	1766	force_x => 0,
1670	force_y => "max",	1767	force_y => "max",
1671	child => $STATUSBOX,	1768	child => $STATUSBOX,
1672	)->show;	1769	)->show;
1673		1770
1674	CFClient::UI::FancyFrame->new (	1771	CFPlus::UI::Toplevel->new (
1675	title => "Map",	1772	title => "Map",
1676	name => "mapmap",	1773	name => "mapmap",
1677	x => 0,	1774	x => 0,
1678	y => $FONTSIZE + 8,	1775	y => $FONTSIZE + 8,
1679	border_bg => [1, 1, 1, 192/255],	1776	border_bg => [1, 1, 1, 192/255],
1680	bg => [1, 1, 1, 0],	1777	bg => [1, 1, 1, 0],
1681	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1778	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1682	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1779	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1683	),	1780	),
1684	)->show;	1781	)->show;
1685		1782
1686	$MAPWIDGET = new CFClient::MapWidget;	1783	$MAPWIDGET = new CFPlus::MapWidget;
1687	$MAPWIDGET->connect (activate_console => sub {	1784	$MAPWIDGET->connect (activate_console => sub {
1688	my ($mapwidget, $preset) = @_;	1785	my ($mapwidget, $preset) = @_;
1689		1786
1690	if ($CONSOLE) {	1787	if ($CONSOLE) {
1691	$CONSOLE->{input}->{auto_activated} = 1;	1788	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1697	}	1794	}
1698	});	1795	});
1699	$MAPWIDGET->show;	1796	$MAPWIDGET->show;
1700	$MAPWIDGET->grab_focus;	1797	$MAPWIDGET->grab_focus;
1701		1798
1702	$LOGVIEW = new CFClient::UI::TextScroller	1799	$LOGVIEW = new CFPlus::UI::TextScroller
1703	expand => 1,	1800	expand => 1,
1704	font => $FONT_FIXED,	1801	font => $FONT_FIXED,
1705	fontsize => $::CFG->{log_fontsize},	1802	fontsize => $::CFG->{log_fontsize},
1706	indent => -4,	1803	indent => -4,
1707	can_hover => 1,	1804	can_hover => 1,
1708	can_events => 1,	1805	can_events => 1,
1709	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1806	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1710	;	1807	;
1711		1808
1712	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1809	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1713	title => "Setup",	1810	title => "Setup",
1714	name => "setup_dialog",	1811	name => "setup_dialog",
1715	x => 'center',	1812	x => 'center',
1716	y => 'center',	1813	y => 'center',
1717	z => 2,	1814	z => 2,
…		…
1720	has_close_button => 1,	1817	has_close_button => 1,
1721	;	1818	;
1722		1819
1723	$METASERVER = metaserver_dialog;	1820	$METASERVER = metaserver_dialog;
1724		1821
1725	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1822	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1726	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1823	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1727		1824
1728	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1825	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1729	"Configure the server to play on, your username, password and other server-related options.");	1826	"Configure the server to play on, your username, password and other server-related options.");
1730	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1827	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1731	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1828	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
…		…
1741	. "After pressing the combo the binding will be saved automatically and the "	1838	. "After pressing the combo the binding will be saved automatically and the "
1742	. "binding editor closes");	1839	. "binding editor closes");
1743	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1840	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1744	"Some debuggin' options. Do not ask.");	1841	"Some debuggin' options. Do not ask.");
1745		1842
1746	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1843	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1747		1844
1748	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1845	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1749	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1846	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1750		1847
1751	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1848	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1752	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1849	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1753		1850
1754	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	1851	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1755		1852
1756	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1853	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1757	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	1854	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1758		1855
1759	$BUTTONBAR->add (new CFClient::UI::Button	1856	$BUTTONBAR->add (new CFPlus::UI::Button
1760	text => "Save Config",	1857	text => "Save Config",
1761	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1858	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1762	on_activate => sub {	1859	on_activate => sub {
1763	$::CFG->{layout} = CFClient::UI::get_layout;	1860	$::CFG->{layout} = CFPlus::UI::get_layout;
1764	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1861	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1765	status "Configuration Saved";	1862	status "Configuration Saved";
1766	0	1863	0
1767	},	1864	},
1768	);	1865	);
1769		1866
1770	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1867	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1771	tooltip => "View Documentation");	1868	tooltip => "View Documentation");
1772		1869
		1870
1773	$BUTTONBAR->add (new CFClient::UI::Button	1871	$BUTTONBAR->add (new CFPlus::UI::Button
1774	text => "Quit",	1872	text => "Quit",
1775	tooltip => "Terminates the program",	1873	tooltip => "Terminates the program",
1776	on_activate => sub {	1874	on_activate => sub {
1777	if ($CONN) {	1875	if ($CONN) {
1778	open_quit_dialog;	1876	open_quit_dialog;
…		…
1788	}	1886	}
1789		1887
1790	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1888	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1791	}	1889	}
1792		1890
		1891	sub setup_build_button {
		1892	my ($enabled) = @_;
		1893	if ($enabled) {
		1894	$BUILD_BUTTON ||= new CFPlus::UI::Button
		1895	text => "Build",
		1896	tooltip => "Opens the ingame builder",
		1897	on_activate => sub {
		1898	if ($CONN) {
		1899	$CONN->send_ext_req (builder_player_items => sub {
		1900	open_ingame_editor ($_[0]) if exists $_[0]->{items};
		1901	});
		1902	}
		1903	0
		1904	};
		1905	$BUTTONBAR->add ($BUILD_BUTTON);
		1906	} else {
		1907	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1908	}
		1909	}
		1910
		1911	sub open_ingame_editor {
		1912	my ($msg) = @_;
		1913
		1914	my $win = new CFPlus::UI::Toplevel
		1915	x => 0,
		1916	y => 'center',
		1917	z => 4,
		1918	name => 'builder_window',
		1919	force_w => int $WIDTH * 1/4,
		1920	force_h => int $HEIGHT * 3/4,
		1921	title => "In game builder",
		1922	has_close_button => 1;
		1923
		1924	my $r = new CFPlus::UI::ScrolledWindow (
		1925	expand => 1,
		1926	scroll_y => 1
		1927	);
		1928	$r->add (my $vb = new CFPlus::UI::VBox);
		1929	$win->add ($r);
		1930
		1931
		1932	$vb->add (my $chk = new CFPlus::UI::Button text => "Disable build mode", on_activate => sub { $::IN_BUILD_MODE = undef });
		1933	$vb->add (my $chk = new CFPlus::UI::Button text => "ERASE", on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } });
		1934
		1935	for my $itemarchname (keys %{$msg->{items}}) {
		1936	$vb->add (
		1937	new CFPlus::UI::Button text => "$itemarchname",
		1938	on_activate => sub {
		1939	$::IN_BUILD_MODE = $itemarchname;
		1940	}
		1941	);
		1942	}
		1943
		1944	$win->show;
		1945	}
		1946
1793	sub video_shutdown {	1947	sub video_shutdown {
1794	CFClient::OpenGL::shutdown;	1948	CFPlus::OpenGL::shutdown;
1795		1949
1796	undef $SDL_ACTIVE;	1950	undef $SDL_ACTIVE;
1797	}	1951	}
1798		1952
1799	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1953	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
…		…
1807		1961
1808	sub audio_music_finished {	1962	sub audio_music_finished {
1809	return unless $CFG->{bgm_enable};	1963	return unless $CFG->{bgm_enable};
1810		1964
1811	# TODO: hack, do play loop and mood music	1965	# TODO: hack, do play loop and mood music
1812	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1966	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1813	$bgmusic->play (0);	1967	$bgmusic->play (0);
1814		1968
1815	push @bgmusic, shift @bgmusic;	1969	push @bgmusic, shift @bgmusic;
1816	}	1970	}
1817		1971
1818	sub audio_init {	1972	sub audio_init {
1819	if ($CFG->{audio_enable}) {	1973	if ($CFG->{audio_enable}) {
1820	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1974	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1821	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1975	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1822		1976
1823	unless ($SDL_MIXER) {	1977	unless ($SDL_MIXER) {
1824	status "Unable to open sound device: there will be no sound";	1978	status "Unable to open sound device: there will be no sound";
1825	return;	1979	return;
1826	}	1980	}
1827		1981
1828	CFClient::Mix_AllocateChannels 8;	1982	CFPlus::Mix_AllocateChannels 8;
1829	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1983	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1830		1984
1831	audio_music_finished;	1985	audio_music_finished;
1832		1986
		1987	local $_;
1833	while (<$fh>) {	1988	while (<$fh>) {
1834	next if /^\s*#/;	1989	next if /^\s*#/;
1835	next if /^\s*$/;	1990	next if /^\s*$/;
1836		1991
1837	my ($file, $volume, $event) = split /\s+/, $_, 3;	1992	my ($file, $volume, $event) = split /\s+/, $_, 3;
1838		1993
1839	push @SOUNDS, "$volume,$file";	1994	push @SOUNDS, "$volume,$file";
1840		1995
1841	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1996	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1842	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1997	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1843	$chunk->volume ($volume * 128 / 100);	1998	$chunk->volume ($volume * 128 / 100);
1844	$chunk	1999	$chunk
1845	};	2000	};
1846	}	2001	}
1847	} else {	2002	} else {
…		…
1849	}	2004	}
1850	}	2005	}
1851	}	2006	}
1852		2007
1853	sub audio_shutdown {	2008	sub audio_shutdown {
1854	CFClient::Mix_CloseAudio if $SDL_MIXER;	2009	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1855	undef $SDL_MIXER;	2010	undef $SDL_MIXER;
1856	@SOUNDS = ();	2011	@SOUNDS = ();
1857	%AUDIO_CHUNKS = ();	2012	%AUDIO_CHUNKS = ();
1858	}	2013	}
1859		2014
…		…
1866		2021
1867	sub force_refresh {	2022	sub force_refresh {
1868	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2023	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1869	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2024	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1870		2025
1871	$CFClient::UI::ROOT->draw;	2026	$CFPlus::UI::ROOT->draw;
1872		2027
1873	$WANT_REFRESH = 0;	2028	$WANT_REFRESH = 0;
1874	$CAN_REFRESH = 0;	2029	$CAN_REFRESH = 0;
1875	$LAST_REFRESH = $NOW;	2030	$LAST_REFRESH = $NOW;
1876		2031
1877	CFClient::SDL_GL_SwapBuffers;	2032	CFPlus::SDL_GL_SwapBuffers;
1878	}	2033	}
1879		2034
1880	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2035	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1881	$NOW = time;	2036	$NOW = time;
1882		2037
1883	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2038	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1884	for CFClient::SDL_PollEvent;	2039	for CFPlus::SDL_PollEvent;
1885		2040
1886	if (%animate_object) {	2041	if (%animate_object) {
1887	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2042	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1888	$WANT_REFRESH++;	2043	$WANT_REFRESH++;
1889	}	2044	}
…		…
1913	$CONN->face_prefetch	2068	$CONN->face_prefetch
1914	if $CONN;	2069	if $CONN;
1915	});	2070	});
1916		2071
1917	%SDL_CB = (	2072	%SDL_CB = (
1918	CFClient::SDL_QUIT => sub {	2073	CFPlus::SDL_QUIT => sub {
1919	Event::unloop -1;	2074	Event::unloop -1;
1920	},	2075	},
1921	CFClient::SDL_VIDEORESIZE => sub {	2076	CFPlus::SDL_VIDEORESIZE => sub {
1922	},	2077	},
1923	CFClient::SDL_VIDEOEXPOSE => sub {	2078	CFPlus::SDL_VIDEOEXPOSE => sub {
1924	CFClient::UI::full_refresh;	2079	CFPlus::UI::full_refresh;
1925	},	2080	},
1926	CFClient::SDL_ACTIVEEVENT => sub {	2081	CFPlus::SDL_ACTIVEEVENT => sub {
1927	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2082	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1928	},	2083	},
1929	CFClient::SDL_KEYDOWN => sub {	2084	CFPlus::SDL_KEYDOWN => sub {
1930	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2085	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1931	# alt-enter	2086	# alt-enter
1932	$FULLSCREEN_ENABLE->toggle;	2087	$FULLSCREEN_ENABLE->toggle;
1933	video_shutdown;	2088	video_shutdown;
1934	video_init;	2089	video_init;
1935	} else {	2090	} else {
1936	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2091	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1937	}	2092	}
1938	},	2093	},
1939	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2094	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1940	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2095	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1941	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2096	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1942	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2097	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1943	CFClient::SDL_USEREVENT => sub {	2098	CFPlus::SDL_USEREVENT => sub {
1944	if ($_[0]{code} == 1) {	2099	if ($_[0]{code} == 1) {
1945	audio_channel_finished $_[0]{data1};	2100	audio_channel_finished $_[0]{data1};
1946	} elsif ($_[0]{code} == 0) {	2101	} elsif ($_[0]{code} == 0) {
1947	audio_music_finished;	2102	audio_music_finished;
1948	}	2103	}
…		…
1952	#############################################################################	2107	#############################################################################
1953		2108
1954	$SIG{INT} = $SIG{TERM} = sub { exit };	2109	$SIG{INT} = $SIG{TERM} = sub { exit };
1955		2110
1956	{	2111	{
1957	local $SIG{__DIE__} = sub {
1958	return unless defined $^S && !$^S;
1959	Carp::confess $_[0];#d#TODO: remove when stable
1960	CFClient::fatal $_[0];
1961	};
1962
1963	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2112	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1964	CFClient::UI::set_layout ($::CFG->{layout});	2113	CFPlus::UI::set_layout ($::CFG->{layout});
1965		2114
1966	my %DEF_CFG = (	2115	my %DEF_CFG = (
1967	sdl_mode => 0,	2116	sdl_mode => 0,
1968	width => 640,	2117	width => 640,
1969	height => 480,	2118	height => 480,
…		…
1977	log_fontsize => 0.7,	2126	log_fontsize => 0.7,
1978	gauge_fontsize => 1,	2127	gauge_fontsize => 1,
1979	gauge_size => 0.35,	2128	gauge_size => 0.35,
1980	stat_fontsize => 0.7,	2129	stat_fontsize => 0.7,
1981	mapsize => 100,	2130	mapsize => 100,
1982	say_command => 'say',	2131	say_command => 'chat',
1983	audio_enable => 1,	2132	audio_enable => 1,
1984	bgm_enable => 1,	2133	bgm_enable => 1,
1985	bgm_volume => 0.25,	2134	bgm_volume => 0.25,
1986	face_prefetch => 0,	2135	face_prefetch => 0,
1987	output_sync => 1,	2136	output_sync => 1,
1988	output_count => 1,	2137	output_count => 1,
1989	pickup => 0,	2138	pickup => 0,
		2139	inv_sort => "mtime",
1990	default => "profile", # default profile	2140	default => "profile", # default profile
		2141	show_tips => 1,
1991	);	2142	);
1992		2143
1993	while (my ($k, $v) = each %DEF_CFG) {	2144	while (my ($k, $v) = each %DEF_CFG) {
1994	$CFG->{$k} = $v unless exists $CFG->{$k};	2145	$CFG->{$k} = $v unless exists $CFG->{$k};
1995	}	2146	}
…		…
1998		2149
1999	sdl_init;	2150	sdl_init;
2000		2151
2001	@SDL_MODES = reverse	2152	@SDL_MODES = reverse
2002	grep $_->[0] >= 640 && $_->[1] >= 480,	2153	grep $_->[0] >= 640 && $_->[1] >= 480,
2003	CFClient::SDL_ListModes;	2154	CFPlus::SDL_ListModes;
2004		2155
2005	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2156	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2006		2157
2007	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2158	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2008		2159
2009	{	2160	{
2010	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2161	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2011	DejaVuSans.ttf	2162	DejaVuSans.ttf
2012	DejaVuSansMono.ttf	2163	DejaVuSansMono.ttf
2013	DejaVuSans-Bold.ttf	2164	DejaVuSans-Bold.ttf
2014	DejaVuSansMono-Bold.ttf	2165	DejaVuSansMono-Bold.ttf
2015	DejaVuSans-Oblique.ttf	2166	DejaVuSans-Oblique.ttf
2016	DejaVuSansMono-Oblique.ttf	2167	DejaVuSansMono-Oblique.ttf
2017	DejaVuSans-BoldOblique.ttf	2168	DejaVuSans-BoldOblique.ttf
2018	DejaVuSansMono-BoldOblique.ttf	2169	DejaVuSansMono-BoldOblique.ttf
2019	);	2170	);
2020		2171
2021	CFClient::add_font $_ for @fonts;	2172	CFPlus::add_font $_ for @fonts;
2022		2173
2023	CFClient::pango_init;	2174	CFPlus::pango_init;
2024		2175
2025	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2176	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2026	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2177	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2027		2178
2028	$FONT_PROP->make_default;	2179	$FONT_PROP->make_default;
2029	}	2180	}
2030		2181
2031	# compare mono (ft) vs. rgba (cairo)	2182	# compare mono (ft) vs. rgba (cairo)
2032	# ft - 1.8s, cairo 3s, even in alpha-only mode	2183	# ft - 1.8s, cairo 3s, even in alpha-only mode
2033	# for my $rgba (0..1) {	2184	# for my $rgba (0..1) {
2034	# my $t1 = Time::HiRes::time;	2185	# my $t1 = Time::HiRes::time;
2035	# for (1..1000) {	2186	# for (1..1000) {
2036	# my $layout = CFClient::Layout->new ($rgba);	2187	# my $layout = CFPlus::Layout->new ($rgba);
2037	# $layout->set_text ("hallo" x 100);	2188	# $layout->set_text ("hallo" x 100);
2038	# $layout->render;	2189	# $layout->render;
2039	# }	2190	# }
2040	# my $t2 = Time::HiRes::time;	2191	# my $t2 = Time::HiRes::time;
2041	# warn $t2-$t1;	2192	# warn $t2-$t1;
2042	# }	2193	# }
2043		2194
		2195	$startup_done->();
		2196
2044	video_init;	2197	video_init;
2045	audio_init;	2198	audio_init;
2046	}	2199	}
2047		2200
		2201	show_tip_of_the_day if $CFG->{show_tips};
		2202
2048	Event::loop;	2203	Event::loop;
2049	#CFClient::SDL_Quit;	2204	#CFPlus::SDL_Quit;
2050	#CFClient::_exit 0;	2205	#CFPlus::_exit 0;
2051		2206
2052	END { CFClient::SDL_Quit }	2207	END { CFPlus::SDL_Quit }
2053		2208
2054	=head1 NAME	2209	=head1 NAME
2055		2210
2056	cfplus - A Crossfire+ and Crossfire game client	2211	cfplus - A Crossfire+ and Crossfire game client
2057		2212

Diff Legend

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