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

Diff Legend

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