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.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

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