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

Diff Legend

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