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

Diff Legend

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