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

Diff Legend

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