[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.54 by root, Mon Jun 5 01:59:59 2006 UTC vs.
Revision 1.80 by root, Mon Jun 26 21:59:04 2006 UTC

…		…
25	# need to do it again because that pile of garbage called PAR nukes it before main	25	# need to do it again because that pile of garbage called PAR nukes it before main
26	unshift @INC, $ENV{PAR_TEMP}	26	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	27	if %PAR::LibCache;
28		28
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;
31	use Event;	30	use Event;
32		31
33	use Crossfire;	32	use Crossfire;
34	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
35		34
…		…
37		36
38	use CFClient;	37	use CFClient;
39	use CFClient::OpenGL ();	38	use CFClient::OpenGL ();
40	use CFClient::Protocol;	39	use CFClient::Protocol;
41	use CFClient::UI;	40	use CFClient::UI;
		41	use CFClient::BindingEditor;
42	use CFClient::MapWidget;	42	use CFClient::MapWidget;
		43
		44	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43		45
44	$Event::DIED = sub {	46	$Event::DIED = sub {
45	# TODO: display dialog box or so	47	# TODO: display dialog box or so
46	Carp::confess $_[1];#d#TODO: remove when stable	48	Carp::confess $_[1];#d#TODO: remove when stable
47	CFClient::error $_[1];	49	CFClient::error $_[1];
…		…
83	our $CONSOLE;	85	our $CONSOLE;
84	our $METASERVER;	86	our $METASERVER;
85	our $LOGIN_BUTTON;	87	our $LOGIN_BUTTON;
86	our $QUIT_DIALOG;	88	our $QUIT_DIALOG;
87	our $HOST_ENTRY;	89	our $HOST_ENTRY;
		90	our $SERVER_INFO;
88		91
89	our $SETUP_DIALOG;	92	our $SETUP_DIALOG;
90	our $SETUP_NOTEBOOK;	93	our $SETUP_NOTEBOOK;
91	our $SETUP_SERVER;	94	our $SETUP_SERVER;
92	our $SETUP_KEYBOARD;	95	our $SETUP_KEYBOARD;
93	our $SETUP_SPELLS;	96	our $SETUP_SPELLS;
94		97
		98	our $STATS_WINDOW;
		99	our $MESSAGE_WINDOW;
95	our $FLOORBOX;	100	our $FLOORBOX;
96	our $GAUGES;	101	our $GAUGES;
97	our $STATWIDS;	102	our $STATWIDS;
98		103
99	our $SDL_ACTIVE;	104	our $SDL_ACTIVE;
…		…
111	our $INV;	116	our $INV;
112	our $INVR;	117	our $INVR;
113	our $INV_RIGHT_HB;	118	our $INV_RIGHT_HB;
114		119
115	our $BIND_EDITOR;	120	our $BIND_EDITOR;
		121	our $BIND_UPD_CB;
116		122
117	our $PICKUP_CFG;	123	our $PICKUP_CFG;
118		124
119	sub status {	125	sub status {
120	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	126	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
…		…
122		128
123	sub debug {	129	sub debug {
124	$DEBUG_STATUS->set_text ($_[0]);	130	$DEBUG_STATUS->set_text ($_[0]);
125	}	131	}
126		132
		133	sub destroy_query_dialog {
		134	(delete $_[0]{query_dialog})->destroy
		135	if $_[0]{query_dialog};
		136	}
		137
		138	# server query dialog
		139	sub server_query {
		140	my ($conn, $flags, $prompt) = @_;
		141
		142	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
		143	x => "center",
		144	y => "center",
		145	title => "Server Query",
		146	child => my $vbox = new CFClient::UI::VBox,
		147	;
		148
		149	my @dialog = my $label = new CFClient::UI::Label
		150	max_w => $::WIDTH * 0.4,
		151	ellipsise => 0,
		152	text => $prompt;
		153
		154	if ($flags & CS_QUERY_YESNO) {
		155	push @dialog, my $hbox = new CFClient::UI::HBox;
		156
		157	$hbox->add (new CFClient::UI::Button
		158	text => "No",
		159	on_activate => sub {
		160	$conn->send ("reply n");
		161	$dialog->destroy;
		162	0
		163	}
		164	);
		165	$hbox->add (new CFClient::UI::Button
		166	text => "Yes",
		167	on_activate => sub {
		168	$conn->send ("reply y");
		169	destroy_query_dialog $conn;
		170	0
		171	},
		172	);
		173
		174	$dialog->grab_focus;
		175
		176	} elsif ($flags & CS_QUERY_SINGLECHAR) {
		177	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		178
		179	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
		180	$MESSAGE_WINDOW->show;
		181
		182	unshift @dialog, new CFClient::UI::Label
		183	max_w => $::WIDTH * 0.4,
		184	ellipsise => 0,
		185	markup => "\nOr use your keyboard:\n";
		186
		187	unshift @dialog, my $table = new CFClient::UI::Table;
		188
		189	$table->add (0, 0, new CFClient::UI::Button
		190	text => "Next Race",
		191	on_activate => sub {
		192	$conn->send ("reply n");
		193	destroy_query_dialog $conn;
		194	0
		195	},
		196	);
		197	$table->add (2, 0, new CFClient::UI::Button
		198	text => "Accept",
		199	on_activate => sub {
		200	$conn->send ("reply d");
		201	destroy_query_dialog $conn;
		202	0
		203	},
		204	);
		205
		206	unshift @dialog, new CFClient::UI::Label
		207	max_w => $::WIDTH * 0.4,
		208	ellipsise => 0,
		209	markup =>
		210	"<big><b>Character Creation: Race</b></big>\n\n"
		211	. "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 "
		214	. "(<small>this is below this dialog window, you may need to click on 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, "
		216	. "so you can take your time making this important choice."
		217	;
		218
		219	} elsif ($prompt =~ /roll new stats/) {
		220	if (my $stat = delete $conn->{stat_change_with}) {
		221	$conn->send ("reply $stat");
		222	destroy_query_dialog $conn;
		223	return;
		224	}
		225
		226	$STATS_WINDOW->show;
		227	$MESSAGE_WINDOW->hide;
		228
		229	unshift @dialog, new CFClient::UI::Label
		230	max_w => $::WIDTH * 0.4,
		231	ellipsise => 0,
		232	markup => "\nOr use your keyboard:\n";
		233
		234	unshift @dialog, my $table = new CFClient::UI::Table;
		235
		236	# left: re-roll
		237	$table->add (0, 0, new CFClient::UI::Button
		238	text => "Roll Again",
		239	on_activate => sub {
		240	$conn->send ("reply y");
		241	destroy_query_dialog $conn;
		242	0
		243	},
		244	);
		245
		246	# center: swap stats
		247	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
		248	value => $_,
		249	options => [
		250	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
		251	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		252	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		253	[4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		254	[5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		255	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
		256	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
		257	],
		258	), 1 .. 2;
		259
		260	$table->add (2, 0, new CFClient::UI::Button
		261	text => "Swap Stats",
		262	on_activate => sub {
		263	$conn->{stat_change_with} = $sw2->{value};
		264	$conn->send ("reply $sw1->{value}");
		265	destroy_query_dialog $conn;
		266	0
		267	},
		268	);
		269	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
		270
		271	# right: accept
		272	$table->add (4, 0, new CFClient::UI::Button
		273	text => "Accept",
		274	on_activate => sub {
		275	$conn->send ("reply n");
		276	$STATS_WINDOW->hide;
		277	destroy_query_dialog $conn;
		278	0
		279	},
		280	);
		281
		282	unshift @dialog, new CFClient::UI::Label
		283	max_w => $::WIDTH * 0.4,
		284	ellipsise => 0,
		285	markup =>
		286	"<big><b>Character Creation: Stats</b></big>\n\n"
		287	. "Look at the <b>Stats</b> window to see your basic stats "
		288	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\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. "
		290	. "Race selection will influence those values later on."
		291	;
		292	}
		293
		294	push @dialog, my $entry = new CFClient::UI::Entry
		295	on_changed => sub {
		296	$conn->send ("reply $_[1]");
		297	destroy_query_dialog $conn;
		298	0
		299	},
		300	;
		301
		302	$entry->grab_focus;
		303
		304	} else {
		305	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		306
		307	push @dialog, my $entry = new CFClient::UI::Entry
		308	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
		309	on_activate => sub {
		310	$conn->send ("reply $_[1]");
		311	destroy_query_dialog $conn;
		312	0
		313	},
		314	;
		315
		316	$entry->grab_focus;
		317	}
		318
		319	$vbox->add (@dialog);
		320	$dialog->show;
		321	}
		322
127	sub start_game {	323	sub start_game {
128	status "logging in...";	324	status "logging in...";
129		325
130	$LOGIN_BUTTON->set_text ("Logout");	326	$LOGIN_BUTTON->set_text ("Logout");
131	$SETUP_DIALOG->hide;	327	$SETUP_DIALOG->hide;
132		328
133	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	329	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
134		330
135	my ($host, $port) = split /:/, $CFG->{host};	331	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
136		332
137	$MAP = new CFClient::Map $mapsize, $mapsize;	333	$MAP = new CFClient::Map $mapsize, $mapsize;
138		334
139	$CONN = eval {	335	$CONN = eval {
140	new CFClient::Protocol	336	new CFClient::Protocol
141	host => $host,	337	host => $host,
142	port => $port \|\| 13327,	338	port => $port \|\| 13327,
143	user => $CFG->{user},	339	user => $CFG->{profile}{default}{user},
144	pass => $CFG->{password},	340	pass => $CFG->{profile}{default}{password},
145	mapw => $mapsize,	341	mapw => $mapsize,
146	maph => $mapsize,	342	maph => $mapsize,
147		343
148	map_widget => $MAPWIDGET,	344	map_widget => $MAPWIDGET,
149	logview => $LOGVIEW,	345	logview => $LOGVIEW,
150	statusbox => $STATUSBOX,	346	statusbox => $STATUSBOX,
151	map => $MAP,	347	map => $MAP,
152	mapmap => $MAPMAP,	348	mapmap => $MAPMAP,
		349	query => \&server_query,
153		350
154	sound_play => sub {	351	sound_play => sub {
155	my ($x, $y, $soundnum, $type) = @_;	352	my ($x, $y, $soundnum, $type) = @_;
156		353
157	$SDL_MIXER	354	$SDL_MIXER
…		…
177	sub stop_game {	374	sub stop_game {
178	$LOGIN_BUTTON->set_text ("Login");	375	$LOGIN_BUTTON->set_text ("Login");
179	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	376	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
180	$SETUP_DIALOG->show;	377	$SETUP_DIALOG->show;
181	$INV_WINDOW->hide;	378	$INV_WINDOW->hide;
		379	$SETUP_SPELLS->clear_spells;
182		380
183	return unless $CONN;	381	return unless $CONN;
184		382
185	status "connection closed";	383	status "connection closed";
186		384
		385	destroy_query_dialog $CONN;
187	$CONN->destroy;	386	$CONN->destroy;
188	$CONN = 0; # false, does not autovivify	387	$CONN = 0; # false, does not autovivify
		388
		389	undef $MAP;
189	}	390	}
190		391
191	sub graphics_setup {	392	sub graphics_setup {
192	my $vbox = new CFClient::UI::VBox;	393	my $vbox = new CFClient::UI::VBox;
193		394
…		…
211		412
212	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	413	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
213	$table->add (1, $row++, new CFClient::UI::CheckBox	414	$table->add (1, $row++, new CFClient::UI::CheckBox
214	state => $CFG->{fullscreen},	415	state => $CFG->{fullscreen},
215	tooltip => "Bring the client into fullscreen mode.",	416	tooltip => "Bring the client into fullscreen mode.",
216	on_changed => sub {	417	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217	my ($self, $value) = @_;
218	$CFG->{fullscreen} = $value;
219	}
220	);	418	);
221		419
222	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	420	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
223	$table->add (1, $row++, new CFClient::UI::CheckBox	421	$table->add (1, $row++, new CFClient::UI::CheckBox
224	state => $CFG->{fast},	422	state => $CFG->{fast},
225	tooltip => "Lower the visual quality considerably to speed up rendering.",	423	tooltip => "Lower the visual quality considerably to speed up rendering.",
226	on_changed => sub {	424	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
227	my ($self, $value) = @_;
228	$CFG->{fast} = $value;
229	}
230	);	425	);
231		426
232	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	427	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
233	$table->add (1, $row++, new CFClient::UI::Slider	428	$table->add (1, $row++, new CFClient::UI::Slider
234	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	429	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	430	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236	on_changed => sub {	431	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237	my ($self, $value) = @_;
238	$CFG->{map_scale} = 2 ** $value;
239	}
240	);	432	);
241		433
242	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	434	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
243	$table->add (1, $row++, new CFClient::UI::CheckBox	435	$table->add (1, $row++, new CFClient::UI::CheckBox
244	state => $CFG->{fow_enable},	436	state => $CFG->{fow_enable},
245	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	437	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
246	on_changed => sub {	438	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247	my ($self, $value) = @_;
248	$CFG->{fow_enable} = $value;
249	}
250	);	439	);
251		440
252	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	441	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
253	$table->add (1, $row++, new CFClient::UI::Slider	442	$table->add (1, $row++, new CFClient::UI::Slider
254	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	443	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	444	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
256	on_changed => sub {	445	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257	my ($self, $value) = @_;
258	$CFG->{fow_intensity} = $value;
259	}
260	);	446	);
261		447
262	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	448	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
263	$table->add (1, $row++, new CFClient::UI::CheckBox	449	$table->add (1, $row++, new CFClient::UI::CheckBox
264	state => $CFG->{fow_smooth},	450	state => $CFG->{fow_smooth},
265	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	451	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
266	on_changed => sub {	452	on_changed => sub {
267	my ($self, $value) = @_;	453	my ($self, $value) = @_;
268	$CFG->{fow_smooth} = $value;	454	$CFG->{fow_smooth} = $value;
269	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	455	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
		456	0
270	}	457	}
271	);	458	);
272		459
273	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	460	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
274	$table->add (1, $row++, new CFClient::UI::Slider	461	$table->add (1, $row++, new CFClient::UI::Slider
275	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	462	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	463	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	464	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
278	);	465	);
279		466
280	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	467	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
281	$table->add (1, $row++, new CFClient::UI::Slider	468	$table->add (1, $row++, new CFClient::UI::Slider
282	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	469	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	470	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
284	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	471	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285	);	472	);
286		473
287	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");	474	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
288		475
289	$table->add (1, $row++, new CFClient::UI::Slider	476	$table->add (1, $row++, new CFClient::UI::Slider
290	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],	477	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",	478	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292	on_changed => sub {	479	on_changed => sub {
293	$CFG->{stat_fontsize} = $_[1];	480	$CFG->{stat_fontsize} = $_[1];
294	&set_stats_window_fontsize;	481	&set_stats_window_fontsize;
		482	0
295	}	483	}
296	);	484	);
297		485
298	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	486	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
299	$table->add (1, $row++, new CFClient::UI::Slider	487	$table->add (1, $row++, new CFClient::UI::Slider
300	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	488	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	489	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
302	on_changed => sub {	490	on_changed => sub {
303	$CFG->{gauge_fontsize} = $_[1];	491	$CFG->{gauge_fontsize} = $_[1];
304	&set_gauge_window_fontsize;	492	&set_gauge_window_fontsize;
		493	0
305	}	494	}
306	);	495	);
307		496
308	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	497	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
309	$table->add (1, $row++, new CFClient::UI::Slider	498	$table->add (1, $row++, new CFClient::UI::Slider
310	range => [$CFG->{gauge_size}, 0.2, 0.8],	499	range => [$CFG->{gauge_size}, 0.2, 0.8],
311	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	500	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
312	on_changed => sub {	501	on_changed => sub {
313	$CFG->{gauge_size} = $_[1];	502	$CFG->{gauge_size} = $_[1];
314	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	503	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		504	0
315	}	505	}
316	);	506	);
317		507
318	$table->add (1, $row++, new CFClient::UI::Button	508	$table->add (1, $row++, new CFClient::UI::Button
319	expand => 1, align => 0, text => "Apply",	509	expand => 1, align => 0, text => "Apply",
320	tooltip => "Apply the video settings",	510	tooltip => "Apply the video settings",
321	on_activate => sub {	511	on_activate => sub {
322	video_shutdown ();	512	video_shutdown ();
323	video_init ();	513	video_init ();
		514	0
324	}	515	}
325	);	516	);
326		517
327	$vbox	518	$vbox
328	}	519	}
…		…
336		527
337	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	528	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
338	$table->add (1, $row++, new CFClient::UI::CheckBox	529	$table->add (1, $row++, new CFClient::UI::CheckBox
339	state => $CFG->{audio_enable},	530	state => $CFG->{audio_enable},
340	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.",	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.",
341	on_changed => sub {	532	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
342	$CFG->{audio_enable} = $_[1];
343	}
344	);	533	);
345	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	534	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
346	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	535	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
347	# $CFG->{effects_volume} = $_[1];	536	# $CFG->{effects_volume} = $_[1];
348	# });	537	# });
349	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	538	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
350	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	539	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
351	$hbox->add (new CFClient::UI::CheckBox	540	$hbox->add (new CFClient::UI::CheckBox
352	expand => 1, state => $CFG->{bgm_enable},	541	expand => 1, state => $CFG->{bgm_enable},
353	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	542	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
354	on_changed => sub {	543	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
355	$CFG->{bgm_enable} = $_[1];
356	}
357	);	544	);
358	$hbox->add (new CFClient::UI::Slider	545	$hbox->add (new CFClient::UI::Slider
359	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	546	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
360	tooltip => "The volume of the background music. Changes are instant.",	547	tooltip => "The volume of the background music. Changes are instant.",
361	on_changed => sub {	548	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
362	$CFG->{bgm_volume} = $_[1];
363	CFClient::MixMusic::volume $_[1] * 128;
364	}
365	);	549	);
366		550
367	$table->add (1, $row++, new CFClient::UI::Button	551	$table->add (1, $row++, new CFClient::UI::Button
368	expand => 1, align => 0, text => "Apply",	552	expand => 1, align => 0, text => "Apply",
369	tooltip => "Apply the audio settings",	553	tooltip => "Apply the audio settings",
370	on_activate => sub {	554	on_activate => sub {
371	audio_shutdown ();	555	audio_shutdown ();
372	audio_init ();	556	audio_init ();
		557	0
373	}	558	}
374	);	559	);
375		560
376	$vbox	561	$vbox
377	}	562	}
…		…
439	&set_gauge_window_fontsize;	624	&set_gauge_window_fontsize;
440		625
441	$win	626	$win
442	}	627	}
443		628
		629	sub debug_setup {
		630	my $table = new CFClient::UI::Table;
444		631
		632	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
		633	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
		634	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
		635	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
		636	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
		637	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
		638	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
		639	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		640
		641	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
		642
		643	for my $x (0..2) {
		644	for my $y (0 .. 2) {
		645	$table->add ($x + 3, $y,
		646	new CFClient::UI::Entry
		647	text => $default_smooth[$x * 3 + $y],
		648	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
		649	);
		650	}
		651	}
		652
		653
		654	$table
		655	}
		656
445	sub make_stats_window {	657	sub stats_window {
446	my $tgw = new CFClient::UI::FancyFrame	658	my $tgw = new CFClient::UI::FancyFrame
447	y => $HEIGHT * (2/8),	659	y => $HEIGHT * (2/8),
448	x => "max",	660	x => "max",
449	title => "Stats",	661	title => "Stats",
450	name => "stats_window";	662	name => "stats_window",
		663	has_close_button => 1;
451		664
452	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	665	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
453	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	666	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
454	can_hover => 1, can_events => 1,	667	can_hover => 1, can_events => 1,
455	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	668	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
537	);	750	);
538	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	751	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
539	font => $FONT_FIXED,	752	font => $FONT_FIXED,
540	can_hover => 1,	753	can_hover => 1,
541	can_events => 1,	754	can_events => 1,
542	image => "ui/resist/resist_$_.png",	755	path => "ui/resist/resist_$_.png",
543	tooltip => $resist_names{$_},	756	tooltip => $resist_names{$_},
544	);	757	);
545		758
546	$row++;	759	$row++;
547	if ($row % 6 == 0) {	760	if ($row % 6 == 0) {
…		…
601	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});	814	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
602	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});	815	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
603		816
604	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);	817	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
605		818
606	# TODO: replace by CS_STAT_RES_xxx constants
607	my %tbl = (	819	my %tbl = (
608	phys => 100,	820	phys => CS_STAT_RES_PHYS,
609	magic => 101,	821	magic => CS_STAT_RES_MAG,
610	fire => 102,	822	fire => CS_STAT_RES_FIRE,
611	elec => 103,	823	elec => CS_STAT_RES_ELEC,
612	cold => 104,	824	cold => CS_STAT_RES_COLD,
613	conf => 105,	825	conf => CS_STAT_RES_CONF,
614	acid => 106,	826	acid => CS_STAT_RES_ACID,
615	drain => 107,	827	drain => CS_STAT_RES_DRAIN,
616	ghit => 108,	828	ghit => CS_STAT_RES_GHOSTHIT,
617	pois => 109,	829	pois => CS_STAT_RES_POISON,
618	slow => 110,	830	slow => CS_STAT_RES_SLOW,
619	para => 111,	831	para => CS_STAT_RES_PARA,
620	tund => 112,	832	tund => CS_STAT_TURN_UNDEAD,
621	fear => 113,	833	fear => CS_STAT_RES_FEAR,
622	depl => 113,	834	depl => CS_STAT_RES_DEPLETE,
623	deat => 115,	835	deat => CS_STAT_RES_DEATH,
624	holyw => 116,	836	holyw => CS_STAT_RES_HOLYWORD,
625	blind => 117,	837	blind => CS_STAT_RES_BLIND,
626	);	838	);
627		839
628	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	840	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
629	for keys %tbl;	841	for keys %tbl;
630	}	842	}
…		…
660		872
661	utf8::decode $buf if utf8::valid $buf;	873	utf8::decode $buf if utf8::valid $buf;
662		874
663	$table->clear;	875	$table->clear;
664		876
		877	my @tip = (
		878	"The current number of users logged in on the server.",
		879	"The hostname of the server.",
		880	"The time this server has been running without being restarted.",
		881	"The server software version - a '+' indicates a Crossfire+ server.",
		882	"Short information about this server provided by its admins.",
		883	);
665	my @col = qw(Use #Users Host Uptime Version Description);	884	my @col = qw(#Users Host Uptime Version Description);
666	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	885	$table->add ($_, 0, new CFClient::UI::Label
		886	can_hover => 1, can_events => 1,
		887	align => 0, fg => [1, 1, 0],
		888	text => $col[$_], tooltip => $tip[$_])
667	for 0 .. $#col;	889	for 0 .. $#col;
668		890
669	my @align = qw(1 0 1 1 -1);	891	my @align = qw(1 0 1 1 -1);
670		892
671	my $y = 0;	893	my $y = 0;
672	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	894	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
…		…
689		911
690	$m = [$users, $host, $uptime, $version, $desc];	912	$m = [$users, $host, $uptime, $version, $desc];
691		913
692	$y++;	914	$y++;
693		915
694	$table->add (0, $y, new CFClient::UI::VBox children => [	916	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695	(new CFClient::UI::Button text => "Use", on_activate => sub {	917	(new CFClient::UI::Button
		918	text => "Use",
		919	tooltip => "Put this server into the <b>Host:Port</b> field",
		920	on_activate => sub {
696	$HOST_ENTRY->set_text ($CFG->{host} = $host);	921	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
697	$METASERVER->toggle_visibility;	922	$METASERVER->hide;
		923	0
		924	},
698	}),	925	),
699	(new CFClient::UI::Empty expand => 1),	926	(new CFClient::UI::Empty expand => 1),
700	]);	927	]);
701		928
702	$table->add ($_ + 1, $y, new CFClient::UI::Label	929	$table->add ($_, $y, new CFClient::UI::Label
703	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	930	ellipsise => 0,
		931	align => $align[$_],
		932	text => $m->[$_],
		933	tooltip => $tip[$_],
		934	can_hover => 1,
		935	can_events => 1,
		936	fontsize => 0.8)
704	for 0 .. $#$m;	937	for 0 .. $#$m;
705	}	938	}
706	}	939	}
707	});	940	});
708	}	941	}
709		942
710	sub metaserver_dialog {	943	sub metaserver_dialog {
711	my $dialog = new CFClient::UI::FancyFrame	944	my $dialog = new CFClient::UI::FancyFrame
712	title => "Server List",	945	title => "Server List",
713	name => 'metaserver_dialog',	946	name => 'metaserver_dialog',
714	x => 'center',	947	x => 'center',
715	y => 'center',	948	y => 'center',
		949	z => 3,
		950	force_h => $::HEIGHT * 0.4,
716	child => (my $vbox = new CFClient::UI::VBox),	951	child => (my $vbox = new CFClient::UI::VBox),
		952	has_close_button => 1,
717	on_visibility_change => sub {	953	on_visibility_change => sub {
718	update_metaserver if $_[1];	954	update_metaserver if $_[1];
		955	0
719	},	956	},
720	;	957	;
721		958
722	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	959	$dialog->{table} = new CFClient::UI::Table;
		960
		961	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
723		962
724	$dialog	963	$dialog
725	}	964	}
726		965
727	sub server_setup {	966	sub server_setup {
…		…
734	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	973	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735		974
736	$vbox->add (	975	$vbox->add (
737	$HOST_ENTRY = new CFClient::UI::Entry	976	$HOST_ENTRY = new CFClient::UI::Entry
738	expand => 1,	977	expand => 1,
739	text => $CFG->{host},	978	text => $CFG->{profile}{default}{host},
740	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	979	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741	on_changed => sub {	980	on_changed => sub {
742	my ($self, $value) = @_;	981	my ($self, $value) = @_;
743	$CFG->{host} = $value;	982	$CFG->{profile}{default}{host} = $value;
		983	0
744	}	984	}
745	);	985	);
746		986
747	$METASERVER = metaserver_dialog;	987	$METASERVER = metaserver_dialog;
748		988
749	$vbox->add (new CFClient::UI::Button	989	$vbox->add (new CFClient::UI::Button
750	expand => 1,	990	expand => 1,
751	text => "Server List",	991	text => "Server List",
752	other => $METASERVER,	992	other => $METASERVER,
753	tooltip => "Show a list of available crossfire servers",	993	tooltip => "Show a list of available crossfire servers",
754	on_activate => sub { $METASERVER->toggle_visibility },	994	on_activate => sub { $METASERVER->toggle_visibility; 0 },
		995	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755	);	996	);
756	}	997	}
757		998
758	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	999	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759	$table->add (1, 4, new CFClient::UI::Entry	1000	$table->add (1, 4, new CFClient::UI::Entry
760	text => $CFG->{user},	1001	text => $CFG->{profile}{default}{user},
761	tooltip => "The name of your character on the server",	1002	tooltip => "The name of your character on the server",
762	on_changed => sub {	1003	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763	my ($self, $value) = @_;
764	$CFG->{user} = $value;
765	}
766	);	1004	);
767		1005
768	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1006	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
769	$table->add (1, 5, new CFClient::UI::Entry	1007	$table->add (1, 5, new CFClient::UI::Entry
770	text => $CFG->{password},	1008	text => $CFG->{profile}{default}{password},
771	hidden => 1,	1009	hidden => 1,
772	tooltip => "The password for your character",	1010	tooltip => "The password for your character",
773	on_changed => sub {	1011	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774	my ($self, $value) = @_;
775	$CFG->{password} = $value;
776	}
777	);	1012	);
778		1013
779	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1014	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780	$table->add (1, 7, new CFClient::UI::Slider	1015	$table->add (1, 7, new CFClient::UI::Slider
781	force_w => 100,	1016	force_w => 100,
782	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1017	range => [$CFG->{mapsize}, 10, 100, 0, 1],
783	tooltip => "This is the size of the portion of the map update the server sends you. "	1018	tooltip => "This is the size of the portion of the map update the server sends you. "
784	. "If you set this to a high value you will be able to see further, "	1019	. "If you set this to a high value you will be able to see further, "
785	. "but you also increase bandwidth requirements and latency. "	1020	. "but you also increase bandwidth requirements and latency. "
786	. "This option is only used once at log-in.",	1021	. "This option is only used once at log-in.",
787	on_changed => sub {	1022	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788	my ($self, $value) = @_;
789
790	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791	},
792	);	1023	);
793		1024
794	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1025	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
795	$table->add (1, 8, new CFClient::UI::CheckBox	1026	$table->add (1, 8, new CFClient::UI::CheckBox
796	state => $CFG->{face_prefetch},	1027	state => $CFG->{face_prefetch},
…		…
799	. "This might increase or create lag, but increases the chances "	1030	. "This might increase or create lag, but increases the chances "
800	. "of faces being ready for display when you encounter them. "	1031	. "of faces being ready for display when you encounter them. "
801	. "It also uses up server bandwidth on every connect, "	1032	. "It also uses up server bandwidth on every connect, "
802	. "so only set it if you really need to prefetch images. "	1033	. "so only set it if you really need to prefetch images. "
803	. "This option can be set and unset any time.",	1034	. "This option can be set and unset any time.",
804	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1035	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805	);	1036	);
806		1037
807	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1038	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
808	$table->add (1, 9, new CFClient::UI::Entry	1039	$table->add (1, 9, new CFClient::UI::Entry
809	text => $CFG->{output_count},	1040	text => $CFG->{output_count},
810	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1041	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
811	on_changed => sub { $CFG->{output_count} = $_[1] },	1042	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812	);	1043	);
813		1044
814	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1045	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
815	$table->add (1, 10, new CFClient::UI::Entry	1046	$table->add (1, 10, new CFClient::UI::Entry
816	text => $CFG->{output_sync},	1047	text => $CFG->{output_sync},
817	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1048	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
818	on_changed => sub { $CFG->{output_sync} = $_[1] },	1049	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819	);	1050	);
820		1051
821	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1052	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
822	expand => 1,	1053	expand => 1,
823	align => 0,	1054	align => 0,
824	text => "Login",	1055	text => "Login",
825	on_activate => sub {	1056	on_activate => sub {
826	$CONN ? stop_game	1057	$CONN ? stop_game
827	: start_game;	1058	: start_game;
		1059	0
828	},	1060	},
829	);	1061	);
830		1062
831	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1063	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1064	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
…		…
835	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1067	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1068	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837	on_changed => sub {	1069	on_changed => sub {
838	my ($self, $value) = @_;	1070	my ($self, $value) = @_;
839	$CFG->{say_command} = $value;	1071	$CFG->{say_command} = $value;
		1072	0
840	}	1073	}
841	);	1074	);
		1075
		1076	$vbox->add (new CFClient::UI::Label
		1077	text => "Server Info",
		1078	fontsize => 1.2,
		1079	padding_y => 8,
		1080	fg => [1, 1, 0, 1],
		1081	);
		1082
		1083	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
842		1084
843	$vbox	1085	$vbox
844	}	1086	}
845		1087
846	sub message_window {	1088	sub message_window {
…		…
849	title => "Messages",	1091	title => "Messages",
850	border_bg => [1, 1, 1, 1],	1092	border_bg => [1, 1, 1, 1],
851	bg => [0, 0, 0, 0.75],	1093	bg => [0, 0, 0, 0.75],
852	x => "max",	1094	x => "max",
853	y => 0,	1095	y => 0,
854	force_w => $::WIDTH / 3,	1096	force_w => $::WIDTH * 0.4,
855	force_h => $::HEIGHT / 5,	1097	force_h => $::HEIGHT * 0.5,
856	child => (my $vbox = new CFClient::UI::VBox);	1098	child => (my $vbox = new CFClient::UI::VBox),
		1099	has_close_button => 1;
857		1100
858	$vbox->add ($LOGVIEW);	1101	$vbox->add ($LOGVIEW);
859		1102
860	$vbox->add (my $input = new CFClient::UI::Entry	1103	$vbox->add (my $input = new CFClient::UI::Entry
861	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1104	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
…		…
869		1112
870	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1113	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871	$input->{refocus_map} = 1;	1114	$input->{refocus_map} = 1;
872	}	1115	}
873	delete $input->{auto_activated};	1116	delete $input->{auto_activated};
		1117
		1118	0
874	},	1119	},
875	on_activate => sub {	1120	on_activate => sub {
876	my ($input, $text) = @_;	1121	my ($input, $text) = @_;
877	$input->set_text ('');	1122	$input->set_text ('');
878		1123
…		…
884	}	1129	}
885	if ($input->{refocus_map}) {	1130	if ($input->{refocus_map}) {
886	delete $input->{refocus_map};	1131	delete $input->{refocus_map};
887	$MAPWIDGET->focus_in	1132	$MAPWIDGET->focus_in
888	}	1133	}
		1134
		1135	0
889	},	1136	},
890	on_escape => sub {	1137	on_escape => sub {
891	$MAPWIDGET->focus_in	1138	$MAPWIDGET->grab_focus;
		1139
		1140	0
892	},	1141	},
893	);	1142	);
894		1143
895	$CONSOLE = {	1144	$CONSOLE = {
896	window => $window,	1145	window => $window,
…		…
903	sub open_quit_dialog {	1152	sub open_quit_dialog {
904	unless ($QUIT_DIALOG) {	1153	unless ($QUIT_DIALOG) {
905	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1154	$QUIT_DIALOG = new CFClient::UI::FancyFrame
906	x => "center",	1155	x => "center",
907	y => "center",	1156	y => "center",
		1157	z => 50,
908	title => "Really Quit?",	1158	title => "Really Quit?",
909	;	1159	;
910		1160
911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1161	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912		1162
…		…
917	);	1167	);
918	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1168	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919	$hb->add (new CFClient::UI::Button	1169	$hb->add (new CFClient::UI::Button
920	text => "Ok",	1170	text => "Ok",
921	expand => 1,	1171	expand => 1,
922	on_activate => sub { $QUIT_DIALOG->hide },	1172	on_activate => sub { $QUIT_DIALOG->hide; 0 },
923	);	1173	);
924	$hb->add (new CFClient::UI::Button	1174	$hb->add (new CFClient::UI::Button
925	text => "Quit anyway",	1175	text => "Quit anyway",
926	expand => 1,	1176	expand => 1,
927	on_activate => sub { exit },	1177	on_activate => sub { exit },
…		…
934	sub autopickup_setup {	1184	sub autopickup_setup {
935	my $table = new CFClient::UI::Table;	1185	my $table = new CFClient::UI::Table;
936		1186
937	for (	1187	for (
938	["General", 0, 0,	1188	["General", 0, 0,
939	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],	1189	["Enable autopickup" => PICKUP_NEWMODE],
940	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],	1190	["Inhibit autopickup" => PICKUP_INHIBIT],
941	["Stop before pickup" => CFClient::Pickup::PU_STOP],	1191	["Stop before pickup" => PICKUP_STOP],
942	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],	1192	["Debug autopickup" => PICKUP_DEBUG],
943	],	1193	],
944	["Weapons", 0, 6,	1194	["Weapons", 0, 6,
945	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],	1195	["All weapons" => PICKUP_ALLWEAPON],
946	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],	1196	["Missile weapons" => PICKUP_MISSILEWEAPON],
947	["Bows" => CFClient::Pickup::PU_BOW],	1197	["Bows" => PICKUP_BOW],
948	["Arrows" => CFClient::Pickup::PU_ARROW],	1198	["Arrows" => PICKUP_ARROW],
949	],	1199	],
950	["Armour", 0, 12,	1200	["Armour", 0, 12,
951	["Helmets" => CFClient::Pickup::PU_HELMET],	1201	["Helmets" => PICKUP_HELMET],
952	["Shields" => CFClient::Pickup::PU_SHIELD],	1202	["Shields" => PICKUP_SHIELD],
953	["Body Armour" => CFClient::Pickup::PU_ARMOUR],	1203	["Body Armour" => PICKUP_ARMOUR],
954	["Boots" => CFClient::Pickup::PU_BOOTS],	1204	["Boots" => PICKUP_BOOTS],
955	["Gloves" => CFClient::Pickup::PU_GLOVES],	1205	["Gloves" => PICKUP_GLOVES],
956	["Cloaks" => CFClient::Pickup::PU_CLOAK],	1206	["Cloaks" => PICKUP_CLOAK],
957	],	1207	],
958		1208
959	["Readables", 2, 2,	1209	["Readables", 2, 2,
960	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],	1210	["Spellbooks" => PICKUP_SPELLBOOK],
961	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],	1211	["Skillscrolls" => PICKUP_SKILLSCROLL],
962	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],	1212	["Normal Books/Scrolls" => PICKUP_READABLES],
963	],	1213	],
964	["Misc", 2, 7,	1214	["Misc", 2, 7,
965	["Food" => CFClient::Pickup::PU_FOOD],	1215	["Food" => PICKUP_FOOD],
966	["Drinks" => CFClient::Pickup::PU_DRINK],	1216	["Drinks" => PICKUP_DRINK],
967	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],	1217	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
968	["Keys" => CFClient::Pickup::PU_KEY],	1218	["Keys" => PICKUP_KEY],
969	["Magical Items" => CFClient::Pickup::PU_MAGICAL],	1219	["Magical Items" => PICKUP_MAGICAL],
970	["Potions" => CFClient::Pickup::PU_POTION],	1220	["Potions" => PICKUP_POTION],
971	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],	1221	["Magic Devices" => PICKUP_MAGIC_DEVICE],
972	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],	1222	["Ignore cursed" => PICKUP_NOT_CURSED],
973	["Jewelery" => CFClient::Pickup::PU_JEWELS],	1223	["Jewelery" => PICKUP_JEWELS],
974	],	1224	],
		1225	["Weight/Value ratio", 2, 17]
975	)	1226	)
976	{	1227	{
977	my ($title, $x, $y, @bits) = @$_;	1228	my ($title, $x, $y, @bits) = @$_;
978	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1229	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979		1230
…		…
984	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1235	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1236	$table->add ($x+1, $y, new CFClient::UI::CheckBox
986	state => $CFG->{pickup} & $mask,	1237	state => $CFG->{pickup} & $mask,
987	on_changed => sub {	1238	on_changed => sub {
988	my ($box, $value) = @_;	1239	my ($box, $value) = @_;
		1240
989	if ($value) {	1241	if ($value) {
990	$::CFG->{pickup} \|= $mask;	1242	$::CFG->{pickup} \|= $mask;
991	} else {	1243	} else {
992	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;	1244	$::CFG->{pickup} &= ~$mask;
993	}	1245	}
		1246
994	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})	1247	$::CONN->send_command ("pickup $::CFG->{pickup}")
995	if defined $::CONN;	1248	if defined $::CONN;
		1249
		1250	0
996	});	1251	});
997	}	1252	}
998	}	1253	}
999		1254
		1255	$table->add (2, 18, new CFClient::UI::ValSlider
		1256	range => [0, 0, 16, 1, 1],
		1257	to_value => sub { ">= " . 5 * $_[0] },
		1258	on_changed => sub {
		1259	my ($slider, $value) = @_;
		1260
		1261	$::CFG->{pickup} &= ~0x7;
		1262	$::CFG->{pickup} \|= int $value
		1263	if $value;
		1264	1;
		1265	});
		1266	$table->add (3, 18, new CFClient::UI::Button
		1267	text => "set",
		1268	on_activate => sub {
		1269	$::CONN->send_command ("pickup $::CFG->{pickup}")
		1270	if defined $::CONN;
		1271	0
		1272	});
		1273
1000	$table	1274	$table
1001	}	1275	}
1002		1276
1003	sub make_inventory_window {	1277	sub inventory_window {
1004	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1278	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005	x => "center",	1279	x => "center",
1006	y => "center",	1280	y => "center",
1007	force_w => $WIDTH * 9/10,	1281	force_w => $WIDTH * 9/10,
1008	force_h => $HEIGHT * 9/10,	1282	force_h => $HEIGHT * 9/10,
1009	title => "Inventory",	1283	title => "Inventory",
		1284	has_close_button => 1,
1010	;	1285	;
1011		1286
1012	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1287	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1013		1288
1014	$hb->add (my $vb1 = new CFClient::UI::VBox);	1289	$hb->add (my $vb1 = new CFClient::UI::VBox);
…		…
1029		1304
1030	sub spell_setup {	1305	sub spell_setup {
1031	new CFClient::UI::SpellList	1306	new CFClient::UI::SpellList
1032	}	1307	}
1033		1308
		1309	sub update_bindings {
		1310	$BIND_UPD_CB->() if $BIND_UPD_CB;
		1311	}
		1312
1034	sub keyboard_setup {	1313	sub keyboard_setup {
1035	my $binding_list = new CFClient::UI::VBox;	1314	my $binding_list = new CFClient::UI::VBox;
1036		1315
1037	my $refresh;	1316	my $refresh;
1038	$refresh = sub {	1317	$refresh = $BIND_UPD_CB = sub {
1039	$binding_list->clear ();	1318	$binding_list->clear ();
1040		1319
1041	for my $mod (keys %{$::CFG->{bindings}}) {	1320	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1042	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1321	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1043	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1322	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1044	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1323	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045		1324
1046	my $lbl = join "; ", @$cmds;	1325	my $lbl = join "; ", @$cmds;
1047	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1326	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1048	$binding_list->add (my $hb = new CFClient::UI::HBox);	1327	$binding_list->add (my $hb = new CFClient::UI::HBox);
1049	$hb->add (new CFClient::UI::Button	1328	$hb->add (new CFClient::UI::Button
1050	text => "delete",	1329	text => "delete",
1051	tooltip => "Deletes the binding",	1330	tooltip => "Deletes the binding",
1052	on_activate => sub {	1331	on_activate => sub {
1053	$binding_list->remove ($hb);	1332	$binding_list->remove ($hb);
1054	delete $::CFG->{bindings}->{$mod}->{$sym};	1333	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		1334	0
1055	});	1335	});
1056		1336
1057	$hb->add (new CFClient::UI::Button	1337	$hb->add (new CFClient::UI::Button
1058	text => "edit",	1338	text => "edit",
1059	tooltip => "Edits the binding",	1339	tooltip => "Edits the binding",
1060	on_activate => sub {	1340	on_activate => sub {
1061	$::BIND_EDITOR->set_binding (	1341	$::BIND_EDITOR->set_binding (
1062	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1342	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1063	sub {	1343	sub {
1064	my ($nmod, $nsym, $ncmds) = @_;	1344	my ($nmod, $nsym, $ncmds) = @_;
1065	delete $::CFG->{bindings}->{$mod}->{$sym};	1345	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1066	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1346	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1067	$refresh->();	1347	$refresh->();
1068	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1348	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069	$SETUP_DIALOG->show;	1349	$SETUP_DIALOG->show;
1070	},	1350	},
1071	sub {	1351	sub {
1072	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1352	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073	$SETUP_DIALOG->show;	1353	$SETUP_DIALOG->show;
1074	});	1354	});
1075	$::BIND_EDITOR->show;	1355	$::BIND_EDITOR->show;
1076	$SETUP_DIALOG->hide;	1356	$SETUP_DIALOG->hide;
		1357	0
1077	});	1358	});
1078		1359
1079	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1360	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1080	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1361	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1081	}	1362	}
1082	}	1363	}
1083	};	1364	};
1084		1365
1085	my $vb = new CFClient::UI::VBox;	1366	my $vb = new CFClient::UI::VBox;
		1367	$vb->add (my $hb = new CFClient::UI::HBox);
		1368	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
		1369	$hb->add (new CFClient::UI::CheckBox
		1370	expand => 1,
		1371	state => $CFG->{shift_fire_stop},
		1372	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1373	on_changed => sub {
		1374	my ($cbox, $value) = @_;
		1375	$CFG->{shift_fire_stop} = $value;
		1376	0
		1377	});
		1378
1086	$vb->add ($binding_list);	1379	$vb->add ($binding_list);
1087	$vb->add (my $hb = new CFClient::UI::HBox);	1380	$vb->add (my $hb = new CFClient::UI::HBox);
1088		1381
1089	$hb->add (new CFClient::UI::Button	1382	$hb->add (new CFClient::UI::Button
1090	text => "record new",	1383	text => "record new",
…		…
1092	tooltip => "This button opens the binding editor with an empty binding.",	1385	tooltip => "This button opens the binding editor with an empty binding.",
1093	on_activate => sub {	1386	on_activate => sub {
1094	$::BIND_EDITOR->set_binding (undef, undef, [],	1387	$::BIND_EDITOR->set_binding (undef, undef, [],
1095	sub {	1388	sub {
1096	my ($mod, $sym, $cmds) = @_;	1389	my ($mod, $sym, $cmds) = @_;
1097	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1390	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1098	$refresh->();	1391	$refresh->();
1099	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1392	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100	$SETUP_DIALOG->show;	1393	$SETUP_DIALOG->show;
1101	},	1394	},
1102	sub {	1395	sub {
…		…
1104	$SETUP_DIALOG->show;	1397	$SETUP_DIALOG->show;
1105	},	1398	},
1106	);	1399	);
1107	$SETUP_DIALOG->hide;	1400	$SETUP_DIALOG->hide;
1108	$::BIND_EDITOR->show;	1401	$::BIND_EDITOR->show;
		1402	0
1109	},	1403	},
1110	);	1404	);
1111		1405
1112	$hb->add (new CFClient::UI::Button	1406	$hb->add (new CFClient::UI::Button
1113	text => "close",	1407	text => "close",
1114	tooltip => "Closes the binding window",	1408	tooltip => "Closes the binding window",
1115	expand => 1,	1409	expand => 1,
1116	on_activate => sub {	1410	on_activate => sub {
1117	$SETUP_DIALOG->hide;	1411	$SETUP_DIALOG->hide;
		1412	0
1118	}	1413	}
1119	);	1414	);
1120		1415
1121	$refresh->();	1416	$refresh->();
1122		1417
1123	$vb	1418	$vb
1124	}	1419	}
1125		1420
1126	sub make_help_window {	1421	sub help_window {
1127	my $win = new CFClient::UI::FancyFrame	1422	my $win = new CFClient::UI::FancyFrame
1128	x => 'center',	1423	x => 'center',
1129	y => 'center',	1424	y => 'center',
		1425	z => 2,
1130	name => 'doc_browser',	1426	name => 'doc_browser',
1131	force_w => int $WIDTH * 7/8,	1427	force_w => int $WIDTH * 7/8,
1132	force_h => int $HEIGHT * 7/8,	1428	force_h => int $HEIGHT * 7/8,
1133	title => "Documentation";	1429	title => "Documentation";
1134		1430
1135	$win->add (my $vbox = new CFClient::UI::VBox);	1431	$win->add (my $vbox = new CFClient::UI::VBox);
1136		1432
1137	$vbox->add (my $buttons = new CFClient::UI::HBox);	1433	$vbox->add (my $buttons = new CFClient::UI::HBox);
1138	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1434	$vbox->add (my $viewer = new CFClient::UI::TextScroller
		1435	expand => 1, fontsize => 0.8, padding_x => 4);
1139		1436
1140	for (	1437	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
		1438	$buttons->add (my $combo = new CFClient::UI::Combobox
		1439	value => undef,
		1440	options => [
1141	[intro => "Introduction"],	1441	[intro => "Introduction"],
1142	[manual => "Manual"],	1442	[manual => "Main Manual"],
		1443	[skill_help => "Skill Reference"],
		1444	[command_help => "Command Reference"],
1143	[command_help => "Commands"],	1445	[dmcommand_help => "DM Commands"],
1144	[skill_help => "Skills"],	1446	[COPYING => "License Terms"],
1145	) {	1447	],
1146	my ($pod, $label) = @$_;	1448	on_changed => sub {
		1449	my ($self, $pod) = @_;
1147		1450
1148	$buttons->add (new CFClient::UI::Button	1451	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1149	text => $label,	1452	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1150	on_activate => sub {
1151	my $parser = new Pod::POM;
1152	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1153		1453
1154	$viewer->clear;	1454	$viewer->clear;
		1455
		1456	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
		1457	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
		1458	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
		1459	# ]);#d#
1155		1460
1156	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1461	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1157	for @{ CFClient::pod_to_pango_list $pom };	1462	for @$pom;
1158		1463
1159	$viewer->set_offset (0);	1464	$viewer->set_offset (0);
		1465
1160	},	1466	0
		1467	},
		1468	on_visibility_change => sub {
		1469	my ($self, $visible) = @_;
		1470	return unless $visible;
		1471	return if $self->{value};
		1472	$self->set_value ("intro");
		1473	0
		1474	},
1161	);	1475	);
1162	}
1163
1164	$viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1165		1476
1166	$win	1477	$win
1167	}	1478	}
1168		1479
1169	sub sdl_init {	1480	sub sdl_init {
…		…
1206	z => 100,	1517	z => 100,
1207	force_x => "max",	1518	force_x => "max",
1208	force_y => 0;	1519	force_y => 0;
1209	$DEBUG_STATUS->show;	1520	$DEBUG_STATUS->show;
1210		1521
1211	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1522	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1212		1523
1213	$STATUSBOX = new CFClient::UI::Statusbox;	1524	$STATUSBOX = new CFClient::UI::Statusbox;
1214	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1525	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1215		1526
1216	(new CFClient::UI::Frame	1527	(new CFClient::UI::Frame
…		…
1236	$MAPWIDGET->connect (activate_console => sub {	1547	$MAPWIDGET->connect (activate_console => sub {
1237	my ($mapwidget, $preset) = @_;	1548	my ($mapwidget, $preset) = @_;
1238		1549
1239	if ($CONSOLE) {	1550	if ($CONSOLE) {
1240	$CONSOLE->{input}->{auto_activated} = 1;	1551	$CONSOLE->{input}->{auto_activated} = 1;
1241	$CONSOLE->{input}->focus_in;	1552	$CONSOLE->{input}->grab_focus;
1242		1553
1243	if ($preset && $CONSOLE->{input}->get_text eq '') {	1554	if ($preset && $CONSOLE->{input}->get_text eq '') {
1244	$CONSOLE->{input}->set_text ($preset);	1555	$CONSOLE->{input}->set_text ($preset);
1245	}	1556	}
1246	}	1557	}
1247	});	1558	});
1248	$MAPWIDGET->show;	1559	$MAPWIDGET->show;
1249	$MAPWIDGET->focus_in;	1560	$MAPWIDGET->grab_focus;
1250		1561
1251	$LOGVIEW = new CFClient::UI::TextView	1562	$LOGVIEW = new CFClient::UI::TextScroller
1252	expand => 1,	1563	expand => 1,
1253	font => $FONT_FIXED,	1564	font => $FONT_FIXED,
1254	fontsize => $::CFG->{log_fontsize},	1565	fontsize => $::CFG->{log_fontsize},
		1566	indent => -4,
1255	can_hover => 1,	1567	can_hover => 1,
1256	can_events => 1,	1568	can_events => 1,
1257	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1569	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1258	;	1570	;
1259		1571
…		…
1263	x => 'center',	1575	x => 'center',
1264	y => 'center',	1576	y => 'center',
1265	z => 2,	1577	z => 2,
1266	force_w => $::WIDTH * 0.6,	1578	force_w => $::WIDTH * 0.6,
1267	force_h => $::HEIGHT * 0.6,	1579	force_h => $::HEIGHT * 0.6,
		1580	has_close_button => 1,
1268	;	1581	;
1269		1582
1270	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1583	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1271	filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);	1584	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272		1585
1273	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1586	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274	"Configure the server to play on, your username, password and other server-related options.");	1587	"Configure the server to play on, your username, password and other server-related options.");
1275	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1588	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276	"Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");	1589	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1277	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1590	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1591	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1592	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1280	"Configure the use of audio, sound effects and background music.");	1593	"Configure the use of audio, sound effects and background music.");
1281	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1594	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282	"Lets you define, edit and delete bindings."	1595	"Lets you define, edit and delete key bindings."
1283	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1596	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1284	. "with nothing set and the recording started. After doing the actions you "	1597	. "with nothing set and the recording started. After doing the actions you "
1285	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1598	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286	. "After pressing the combo the binding will be saved automatically and the "	1599	. "After pressing the combo the binding will be saved automatically and the "
1287	. "binding editor closes");	1600	. "binding editor closes");
1288	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1601	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1602	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1603	$SETUP_NOTEBOOK->add (Debug => debug_setup,
		1604	"Some debuggin' options. Do not ask.");
1290		1605
1291	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;	1606	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292		1607
1293	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1608	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1294	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1609	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295		1610
1296	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1611	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1297	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1612	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298		1613
1299	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	1614	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
1300		1615
1301	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1616	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1302	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1617	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1303	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1618	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1304	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1619	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1305	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");	1620	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1306		1621
1307	$BUTTONBAR->add (new CFClient::UI::Button	1622	$BUTTONBAR->add (new CFClient::UI::Button
1308	text => "Save Config",	1623	text => "Save Config",
1309	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1624	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1310	on_activate => sub {	1625	on_activate => sub {
1311	$::CFG->{layout} = CFClient::UI::get_layout;	1626	$::CFG->{layout} = CFClient::UI::get_layout;
1312	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1627	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313	status "Configuration Saved";	1628	status "Configuration Saved";
		1629	0
1314	},	1630	},
1315	);	1631	);
1316		1632
1317	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1633	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1318	tooltip => "View Documentation");	1634	tooltip => "View Documentation");
1319		1635
1320	$BUTTONBAR->add (new CFClient::UI::Button	1636	$BUTTONBAR->add (new CFClient::UI::Button
1321	text => "Quit",	1637	text => "Quit",
1322	tooltip => "Terminates the program",	1638	tooltip => "Terminates the program",
…		…
1324	if ($CONN) {	1640	if ($CONN) {
1325	open_quit_dialog;	1641	open_quit_dialog;
1326	} else {	1642	} else {
1327	exit;	1643	exit;
1328	}	1644	}
		1645	0
1329	},	1646	},
1330	);	1647	);
1331		1648
1332	$BUTTONBAR->show;	1649	$BUTTONBAR->show;
1333	$SETUP_DIALOG->show;	1650	$SETUP_DIALOG->show;
…		…
1335		1652
1336	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1653	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1337	}	1654	}
1338		1655
1339	sub video_shutdown {	1656	sub video_shutdown {
		1657	CFClient::OpenGL::shutdown;
		1658
1340	undef $SDL_ACTIVE;	1659	undef $SDL_ACTIVE;
1341	}	1660	}
1342		1661
1343	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1662	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1344	my $bgmusic;#TODO#hack#d#	1663	my $bgmusic;#TODO#hack#d#
…		…
1560		1879
1561	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1880	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1562	CFClient::UI::set_layout ($::CFG->{layout});	1881	CFClient::UI::set_layout ($::CFG->{layout});
1563		1882
1564	my %DEF_CFG = (	1883	my %DEF_CFG = (
1565	sdl_mode => 0,	1884	sdl_mode => 0,
1566	width => 640,	1885	width => 640,
1567	height => 480,	1886	height => 480,
1568	fullscreen => 0,	1887	fullscreen => 0,
1569	fast => 0,	1888	fast => 0,
1570	map_scale => 1,	1889	map_scale => 1,
1571	fow_enable => 1,	1890	fow_enable => 1,
1572	fow_intensity => 0.45,	1891	fow_intensity => 0.45,
1573	fow_smooth => 0,	1892	fow_smooth => 0,
1574	gui_fontsize => 1,	1893	gui_fontsize => 1,
1575	log_fontsize => 1,	1894	log_fontsize => 0.7,
1576	gauge_fontsize=> 1,	1895	gauge_fontsize => 1,
1577	gauge_size => 0.35,	1896	gauge_size => 0.35,
1578	stat_fontsize => 1,	1897	stat_fontsize => 0.7,
1579	mapsize => 100,	1898	mapsize => 100,
1580	host => "crossfire.schmorp.de",
1581	say_command => 'say',	1899	say_command => 'say',
1582	audio_enable => 1,	1900	audio_enable => 1,
1583	bgm_enable => 1,	1901	bgm_enable => 1,
1584	bgm_volume => 0.25,	1902	bgm_volume => 0.25,
1585	face_prefetch => 0,	1903	face_prefetch => 0,
1586	output_sync => 1,	1904	output_sync => 1,
1587	output_count => 1,	1905	output_count => 1,
		1906	pickup => 0,
		1907	default => "profile", # default profile
		1908	);
1588	);	1909
1589
1590	while (my ($k, $v) = each %DEF_CFG) {	1910	while (my ($k, $v) = each %DEF_CFG) {
1591	$CFG->{$k} = $v unless exists $CFG->{$k};	1911	$CFG->{$k} = $v unless exists $CFG->{$k};
1592	}	1912	}
		1913
		1914	$CFG->{profile}{default}{host} \|\|= "crossfire.schmorp.de";
1593		1915
1594	sdl_init;	1916	sdl_init;
1595		1917
1596	@SDL_MODES = reverse	1918	@SDL_MODES = reverse
1597	grep $_->[0] >= 640 && $_->[1] >= 480,	1919	grep $_->[0] >= 640 && $_->[1] >= 480,
…		…
1639	video_init;	1961	video_init;
1640	audio_init;	1962	audio_init;
1641	}	1963	}
1642		1964
1643	Event::loop;	1965	Event::loop;
		1966	#CFClient::SDL_Quit;
		1967	#CFClient::_exit 0;
1644		1968
1645	END { CFClient::SDL_Quit }	1969	END { CFClient::SDL_Quit }
1646		1970
1647	=head1 NAME	1971	=head1 NAME
1648		1972

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.54 by root, Mon Jun 5 01:59:59 2006 UTC vs. Revision 1.80 by root, Mon Jun 26 21:59:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.54 by root, Mon Jun 5 01:59:59 2006 UTC vs.
Revision 1.80 by root, Mon Jun 26 21:59:04 2006 UTC