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

Diff Legend

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