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.103 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.121 by root, Sun Oct 1 18:17:38 2006 UTC

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

Diff Legend

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