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.94 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.138 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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