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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.11 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC

…		…
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;	30	use Pod::POM;
31	use Event;	31	use Event;
32		32
33	use Crossfire;	33	use Crossfire;
34	use Crossfire::Protocol::Base;	34	use Crossfire::Protocol::Constants;
35		35
36	use Compress::LZF;	36	use Compress::LZF;
37		37
38	use CFClient;	38	use CFClient;
39	use CFClient::OpenGL ();	39	use CFClient::OpenGL ();
…		…
81	our $LOGVIEW;	81	our $LOGVIEW;
82	our $CONSOLE;	82	our $CONSOLE;
83	our $METASERVER;	83	our $METASERVER;
84	our $LOGIN_BUTTON;	84	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	85	our $QUIT_DIALOG;
		86	our $SERVER_SETUP;
86		87
87	our $FLOORBOX;	88	our $FLOORBOX;
88	our $GAUGES;	89	our $GAUGES;
89	our $STATWIDS;	90	our $STATWIDS;
90		91
…		…
97		98
98	our $ALT_ENTER_MESSAGE;	99	our $ALT_ENTER_MESSAGE;
99	our $STATUSBOX;	100	our $STATUSBOX;
100	our $DEBUG_STATUS;	101	our $DEBUG_STATUS;
101		102
102	our $INVWIN;	103	our $INV_WINDOW;
103	our $INV;	104	our $INV;
104	our $INVR;	105	our $INVR;
105	our $INVR_LBL;	106	our $INVR_LBL;
106		107
107	sub status {	108	sub status {
…		…
114	$DEBUG_STATUS->move ($WIDTH - $w, 0);	115	$DEBUG_STATUS->move ($WIDTH - $w, 0);
115	}	116	}
116		117
117	sub start_game {	118	sub start_game {
118	status "logging in...";	119	status "logging in...";
		120
		121	$LOGIN_BUTTON->set_text ("Logout");
		122	$SERVER_SETUP->hide;
119		123
120	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	124	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
121		125
122	my ($host, $port) = split /:/, $CFG->{host};	126	my ($host, $port) = split /:/, $CFG->{host};
123		127
…		…
152	};	156	};
153		157
154	if ($CONN) {	158	if ($CONN) {
155	CFClient::lowdelay fileno $CONN->{fh};	159	CFClient::lowdelay fileno $CONN->{fh};
156		160
157	$LOGIN_BUTTON->set_text ("Logout");
158	status "login successful";	161	status "login successful";
159
160	$BUTTONBAR->{children}[1]->emit ("activate")
161	if $BUTTONBAR->{children}[1]->{state};
162
163	} else {	162	} else {
164	status "unable to connect";	163	status "unable to connect";
165	stop_game();	164	stop_game();
166	}	165	}
167	}	166	}
168		167
169	sub stop_game {	168	sub stop_game {
		169	$LOGIN_BUTTON->set_text ("Login");
		170	$SERVER_SETUP->show;
		171	$INV_WINDOW->hide;
		172	$LOGVIEW->hide;
		173
170	return unless $CONN;	174	return unless $CONN;
171		175
172	status "connection closed";	176	status "connection closed";
173	$LOGIN_BUTTON->set_text ("Login");	177
174	$CONN->destroy;	178	$CONN->destroy;
175	$CONN = 0; # false, does not autovivify	179	$CONN = 0; # false, does not autovivify
176
177	$BUTTONBAR->{children}[1]->emit ("activate")
178	unless $BUTTONBAR->{children}[1]->{state};
179	}	180	}
180		181
181	sub client_setup {	182	sub client_setup {
182	my $dialog = new CFClient::UI::FancyFrame	183	my $dialog = new CFClient::UI::FancyFrame
		184	req_x => 1,
		185	req_y => $HEIGHT * (1/8),
		186	name => "client_setup",
183	title => "Client Setup",	187	title => "Client Setup",
184	child => (my $vbox = new CFClient::UI::VBox);	188	child => (my $vbox = new CFClient::UI::VBox);
185	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	189	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186		190
187	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	191	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
…		…
202		206
203	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	207	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
204	$table->add (1, $row++, new CFClient::UI::CheckBox	208	$table->add (1, $row++, new CFClient::UI::CheckBox
205	state => $CFG->{fullscreen},	209	state => $CFG->{fullscreen},
206	tooltip => "Bring the client into fullscreen mode.",	210	tooltip => "Bring the client into fullscreen mode.",
207	connect_changed => sub {	211	on_changed => sub {
208	my ($self, $value) = @_;	212	my ($self, $value) = @_;
209	$CFG->{fullscreen} = $value;	213	$CFG->{fullscreen} = $value;
210	}	214	}
211	);	215	);
212		216
213	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	217	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
214	$table->add (1, $row++, new CFClient::UI::CheckBox	218	$table->add (1, $row++, new CFClient::UI::CheckBox
215	state => $CFG->{fast},	219	state => $CFG->{fast},
216	tooltip => "Lower the visual quality considerably to speed up rendering.",	220	tooltip => "Lower the visual quality considerably to speed up rendering.",
217	connect_changed => sub {	221	on_changed => sub {
218	my ($self, $value) = @_;	222	my ($self, $value) = @_;
219	$CFG->{fast} = $value;	223	$CFG->{fast} = $value;
220	}	224	}
221	);	225	);
222		226
223	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	227	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
224	$table->add (1, $row++, new CFClient::UI::Slider	228	$table->add (1, $row++, new CFClient::UI::Slider
225	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	229	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	230	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227	connect_changed => sub {	231	on_changed => sub {
228	my ($self, $value) = @_;	232	my ($self, $value) = @_;
229	$CFG->{map_scale} = 2 ** $value;	233	$CFG->{map_scale} = 2 ** $value;
230	}	234	}
231	);	235	);
232		236
233	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	237	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
234	$table->add (1, $row++, new CFClient::UI::CheckBox	238	$table->add (1, $row++, new CFClient::UI::CheckBox
235	state => $CFG->{fow_enable},	239	state => $CFG->{fow_enable},
236	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	240	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
237	connect_changed => sub {	241	on_changed => sub {
238	my ($self, $value) = @_;	242	my ($self, $value) = @_;
239	$CFG->{fow_enable} = $value;	243	$CFG->{fow_enable} = $value;
240	}	244	}
241	);	245	);
242		246
243	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	247	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
244	$table->add (1, $row++, new CFClient::UI::Slider	248	$table->add (1, $row++, new CFClient::UI::Slider
245	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	249	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
246	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	250	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
247	connect_changed => sub {	251	on_changed => sub {
248	my ($self, $value) = @_;	252	my ($self, $value) = @_;
249	$CFG->{fow_intensity} = $value;	253	$CFG->{fow_intensity} = $value;
250	}	254	}
251	);	255	);
252		256
253	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	257	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
254	$table->add (1, $row++, new CFClient::UI::CheckBox	258	$table->add (1, $row++, new CFClient::UI::CheckBox
255	state => $CFG->{fow_smooth},	259	state => $CFG->{fow_smooth},
256	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	260	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
257	connect_changed => sub {	261	on_changed => sub {
258	my ($self, $value) = @_;	262	my ($self, $value) = @_;
259	$CFG->{fow_smooth} = $value;	263	$CFG->{fow_smooth} = $value;
260	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	264	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
261	}	265	}
262	);	266	);
263		267
264	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	268	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
265	$table->add (1, $row++, new CFClient::UI::Slider	269	$table->add (1, $row++, new CFClient::UI::Slider
266	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	270	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
267	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	271	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
268	connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },	272	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
269	);	273	);
270		274
271	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	275	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
272	$table->add (1, $row++, new CFClient::UI::Slider	276	$table->add (1, $row++, new CFClient::UI::Slider
273	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	277	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
274	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	278	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
275	connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	279	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
276	);	280	);
277		281
278	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");	282	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279		283
280	$table->add (1, $row++, new CFClient::UI::Slider	284	$table->add (1, $row++, new CFClient::UI::Slider
281	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],	285	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
282	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",	286	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283	connect_changed => sub {	287	on_changed => sub {
284	$CFG->{stat_fontsize} = $_[1];	288	$CFG->{stat_fontsize} = $_[1];
285	&set_stats_window_fontsize;	289	&set_stats_window_fontsize;
286	}	290	}
287	);	291	);
288		292
289	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	293	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
290	$table->add (1, $row++, new CFClient::UI::Slider	294	$table->add (1, $row++, new CFClient::UI::Slider
291	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	295	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
292	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	296	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293	connect_changed => sub {	297	on_changed => sub {
294	$CFG->{gauge_fontsize} = $_[1];	298	$CFG->{gauge_fontsize} = $_[1];
295	&set_gauge_window_fontsize;	299	&set_gauge_window_fontsize;
296	}	300	}
297	);	301	);
298		302
299	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	303	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
300	$table->add (1, $row++, new CFClient::UI::Slider	304	$table->add (1, $row++, new CFClient::UI::Slider
301	range => [$CFG->{gauge_size}, 0.2, 0.8],	305	range => [$CFG->{gauge_size}, 0.2, 0.8],
302	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	306	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
303	connect_changed => sub {	307	on_changed => sub {
304	$CFG->{gauge_size} = $_[1];	308	$CFG->{gauge_size} = $_[1];
305	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	309	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
306	}	310	}
307	);	311	);
308		312
309	$table->add (1, $row++, new CFClient::UI::Button	313	$table->add (1, $row++, new CFClient::UI::Button
310	expand => 1, align => 0, text => "Apply",	314	expand => 1, align => 0, text => "Apply",
311	tooltip => "Apply the video settings",	315	tooltip => "Apply the video settings",
312	connect_activate => sub {	316	on_activate => sub {
313	video_shutdown ();	317	video_shutdown ();
314	video_init ();	318	video_init ();
315	}	319	}
316	);	320	);
317		321
318	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	322	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319	$table->add (1, $row++, new CFClient::UI::CheckBox	323	$table->add (1, $row++, new CFClient::UI::CheckBox
320	state => $CFG->{audio_enable},	324	state => $CFG->{audio_enable},
321	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.",	325	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.",
322	connect_changed => sub {	326	on_changed => sub {
323	$CFG->{audio_enable} = $_[1];	327	$CFG->{audio_enable} = $_[1];
324	}	328	}
325	);	329	);
326	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	330	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
327	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	331	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328	# $CFG->{effects_volume} = $_[1];	332	# $CFG->{effects_volume} = $_[1];
329	# });	333	# });
330	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	334	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
331	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	335	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332	$hbox->add (new CFClient::UI::CheckBox	336	$hbox->add (new CFClient::UI::CheckBox
333	expand => 1, state => $CFG->{bgm_enable},	337	expand => 1, state => $CFG->{bgm_enable},
334	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	338	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335	connect_changed => sub {	339	on_changed => sub {
336	$CFG->{bgm_enable} = $_[1];	340	$CFG->{bgm_enable} = $_[1];
337	}	341	}
338	);	342	);
339	$hbox->add (new CFClient::UI::Slider	343	$hbox->add (new CFClient::UI::Slider
340	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	344	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341	tooltip => "The volume of the background music. Changes are instant.",	345	tooltip => "The volume of the background music. Changes are instant.",
342	connect_changed => sub {	346	on_changed => sub {
343	$CFG->{bgm_volume} = $_[1];	347	$CFG->{bgm_volume} = $_[1];
344	CFClient::MixMusic::volume $_[1] * 128;	348	CFClient::MixMusic::volume $_[1] * 128;
345	}	349	}
346	);	350	);
347		351
348	$table->add (1, $row++, new CFClient::UI::Button	352	$table->add (1, $row++, new CFClient::UI::Button
349	expand => 1, align => 0, text => "Apply",	353	expand => 1, align => 0, text => "Apply",
350	tooltip => "Apply the audio settings",	354	tooltip => "Apply the audio settings",
351	connect_activate => sub {	355	on_activate => sub {
352	audio_shutdown ();	356	audio_shutdown ();
353	audio_init ();	357	audio_init ();
354	}	358	}
355	);	359	);
356		360
…		…
358	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry	362	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359	text => $CFG->{say_command},	363	text => $CFG->{say_command},
360	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. "	364	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. "
361	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	365	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
362	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	366	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363	connect_changed => sub {	367	on_changed => sub {
364	my ($self, $value) = @_;	368	my ($self, $value) = @_;
365	$CFG->{say_command} = $value;	369	$CFG->{say_command} = $value;
366	}	370	}
367	);	371	);
368		372
…		…
383		387
384	sub make_gauge_window {	388	sub make_gauge_window {
385	my $gh = int $HEIGHT * $CFG->{gauge_size};	389	my $gh = int $HEIGHT * $CFG->{gauge_size};
386		390
387	my $win = new CFClient::UI::Frame (	391	my $win = new CFClient::UI::Frame (
		392	req_x => 0,
388	req_y => -1,	393	req_y => -1,
389	user_w => $WIDTH,	394	def_w => $WIDTH,
390	user_h => $gh,	395	def_h => $gh,
391	);	396	);
392		397
393	$win->add (my $hbox = new CFClient::UI::HBox	398	$win->add (my $hbox = new CFClient::UI::HBox
394	children => [	399	children => [
395	(new CFClient::UI::HBox expand => 1),	400	(new CFClient::UI::HBox expand => 1),
…		…
432		437
433	$win	438	$win
434	}	439	}
435		440
436	sub make_stats_window {	441	sub make_stats_window {
437	my $tgw = new CFClient::UI::FancyFrame title => "Stats";	442	my $tgw = new CFClient::UI::FancyFrame
		443	req_y => $HEIGHT * (2/8),
		444	req_x => -1,
		445	title => "Stats",
		446	name => "stats_window";
438		447
439	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	448	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	449	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441	can_hover => 1, can_events => 1,	450	can_hover => 1, can_events => 1,
442	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	451	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
445	tooltip => "The map you are currently on (if supported by the server).");	454	tooltip => "The map you are currently on (if supported by the server).");
446		455
447	$vb->add (my $hb0 = new CFClient::UI::HBox);	456	$vb->add (my $hb0 = new CFClient::UI::HBox);
448	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	457	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
449	can_hover => 1, can_events => 1,	458	can_hover => 1, can_events => 1,
450	tooltip => "This is the amount the Player weights.");	459	tooltip => "The weight of the player including all inventory items.");
451	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	460	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
452	can_hover => 1, can_events => 1,	461	can_hover => 1, can_events => 1,
453	tooltip => "The weight limit, you can't carry more than this.");	462	tooltip => "The weight limit: you cannot carry more than this.");
454		463
455		464
456	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	465	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
457	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	466	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
458		467
…		…
548	}	557	}
549		558
550	sub update_stats_window {	559	sub update_stats_window {
551	my ($stats) = @_;	560	my ($stats) = @_;
552		561
553	# i love text protocols!!!	562	# I love text protocols...
554	my $hp = $stats->{Crossfire::Protocol::Base::CS_STAT_HP} * 1;	563
		564	my $hp = $stats->{+CS_STAT_HP} * 1;
555	my $hp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXHP} * 1;	565	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
556	my $sp = $stats->{Crossfire::Protocol::Base::CS_STAT_SP} * 1;	566	my $sp = $stats->{+CS_STAT_SP} * 1;
557	my $sp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXSP} * 1;	567	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
558	my $fo = $stats->{Crossfire::Protocol::Base::CS_STAT_FOOD} * 1;	568	my $fo = $stats->{+CS_STAT_FOOD} * 1;
559	my $fo_m = 999;	569	my $fo_m = 999;
560	my $gr = $stats->{Crossfire::Protocol::Base::CS_STAT_GRACE} * 1;	570	my $gr = $stats->{+CS_STAT_GRACE} * 1;
561	my $gr_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXGRACE} * 1;	571	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
562		572
563	$GAUGES->{hp} ->set_value ($hp, $hp_m);	573	$GAUGES->{hp} ->set_value ($hp, $hp_m);
564	$GAUGES->{mana} ->set_value ($sp, $sp_m);	574	$GAUGES->{mana} ->set_value ($sp, $sp_m);
565	$GAUGES->{food} ->set_value ($fo, $fo_m);	575	$GAUGES->{food} ->set_value ($fo, $fo_m);
566	$GAUGES->{grace} ->set_value ($gr, $gr_m);	576	$GAUGES->{grace} ->set_value ($gr, $gr_m);
567	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::Base::CS_STAT_EXP64})	577	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
568	. " (lvl " . ($stats->{Crossfire::Protocol::Base::CS_STAT_LEVEL} * 1) . ")");	578	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
569	my $rng = $stats->{Crossfire::Protocol::Base::CS_STAT_RANGE};	579	my $rng = $stats->{+CS_STAT_RANGE};
570	$rng =~ s/^Range: //; # thank you so much dear server	580	$rng =~ s/^Range: //; # thank you so much dear server
571	$GAUGES->{range} ->set_text ("Rng: " . $rng);	581	$GAUGES->{range} ->set_text ("Rng: " . $rng);
572	my $title = $stats->{Crossfire::Protocol::Base::CS_STAT_TITLE};	582	my $title = $stats->{+CS_STAT_TITLE};
573	$title =~ s/^Player: //;	583	$title =~ s/^Player: //;
574	$STATWIDS->{title} ->set_text ("Title: " . $title);	584	$STATWIDS->{title} ->set_text ("Title: " . $title);
575		585
576	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});	586	$STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
577	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});	587	$STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
578	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});	588	$STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
579	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});	589	$STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
580	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});	590	$STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
581	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});	591	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
582	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});	592	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
583	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});	593	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
584	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});	594	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
585	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});	595	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
586	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});	596	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
587	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_SPEED});	597	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
588	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_WEAP_SP});	598	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
589		599
590	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::Base::CS_STAT_WEIGHT_LIM} / 1000);	600	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
591		601
		602	# TODO: replace by CS_STAT_RES_xxx constants
592	my %tbl = (	603	my %tbl = (
593	phys => 100,	604	phys => 100,
594	magic => 101,	605	magic => 101,
595	fire => 102,	606	fire => 102,
596	elec => 103,	607	elec => 103,
…		…
605	tund => 112,	616	tund => 112,
606	fear => 113,	617	fear => 113,
607	depl => 113,	618	depl => 113,
608	deat => 115,	619	deat => 115,
609	holyw => 116,	620	holyw => 116,
610	blind => 117	621	blind => 117,
611	);	622	);
612		623
613	for (keys %tbl) {
614	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});	624	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
615	}	625	for keys %tbl;
616
617	}	626	}
618		627
619	sub metaserver_dialog {	628	sub metaserver_dialog {
620	my $dialog = new CFClient::UI::FancyFrame	629	my $dialog = new CFClient::UI::FancyFrame
621	title => "Server List",	630	title => "Server List",
…		…
689	$m = [$users, $host, $uptime, $version, $desc];	698	$m = [$users, $host, $uptime, $version, $desc];
690		699
691	$y++;	700	$y++;
692		701
693	$table->add (0, $y, new CFClient::UI::VBox children => [	702	$table->add (0, $y, new CFClient::UI::VBox children => [
694	(new CFClient::UI::Button text => "Use", connect_activate => sub {	703	(new CFClient::UI::Button text => "Use", on_activate => sub {
695	$HOST->set_text ($CFG->{host} = $host);	704	$HOST->set_text ($CFG->{host} = $host);
696	}),	705	}),
697	(new CFClient::UI::Empty expand => 1),	706	(new CFClient::UI::Empty expand => 1),
698	]);	707	]);
699		708
…		…
704	}	713	}
705	});	714	});
706	}	715	}
707		716
708	sub server_setup {	717	sub server_setup {
709	my $dialog = new CFClient::UI::FancyFrame	718	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
		719	x => $WIDTH * (1/3),
		720	y => $HEIGHT * (1/8),
		721	name => "server_setup",
710	title => "Server Setup",	722	title => "Server Setup",
711	child => (my $vbox = new CFClient::UI::VBox);	723	child => (my $vbox = new CFClient::UI::VBox),
		724	on_visibility_change => sub {
		725	my ($self, $visible) = @_;
		726	$self->center if $visible;
		727	},
712		728	;
		729
713	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	730	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
714	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	731	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
715		732
716	{	733	{
717	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	734	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
…		…
719	$vbox->add (	736	$vbox->add (
720	my $HOST = new CFClient::UI::Entry	737	my $HOST = new CFClient::UI::Entry
721	expand => 1,	738	expand => 1,
722	text => $CFG->{host},	739	text => $CFG->{host},
723	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	740	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
724	connect_changed => sub {	741	on_changed => sub {
725	my ($self, $value) = @_;	742	my ($self, $value) = @_;
726	$CFG->{host} = $value;	743	$CFG->{host} = $value;
727	}	744	}
728	);	745	);
729		746
…		…
732	$vbox->add (new CFClient::UI::Flopper	749	$vbox->add (new CFClient::UI::Flopper
733	expand => 1,	750	expand => 1,
734	text => "Server List",	751	text => "Server List",
735	other => $METASERVER,	752	other => $METASERVER,
736	tooltip => "Show a list of available crossfire servers",	753	tooltip => "Show a list of available crossfire servers",
737	connect_open => sub {	754	on_open => sub {
738	update_metaserver $HOST;	755	update_metaserver $HOST;
739	}	756	}
740	);	757	);
741	}	758	}
742		759
743	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	760	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
744	$table->add (1, 4, new CFClient::UI::Entry	761	$table->add (1, 4, new CFClient::UI::Entry
745	text => $CFG->{user},	762	text => $CFG->{user},
746	tooltip => "The name of your character on the server",	763	tooltip => "The name of your character on the server",
747	connect_changed => sub {	764	on_changed => sub {
748	my ($self, $value) = @_;	765	my ($self, $value) = @_;
749	$CFG->{user} = $value;	766	$CFG->{user} = $value;
750	}	767	}
751	);	768	);
752		769
753	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	770	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
754	$table->add (1, 5, new CFClient::UI::Entry	771	$table->add (1, 5, new CFClient::UI::Entry
755	text => $CFG->{password},	772	text => $CFG->{password},
756	hidden => 1,	773	hidden => 1,
757	tooltip => "The password for your character",	774	tooltip => "The password for your character",
758	connect_changed => sub {	775	on_changed => sub {
759	my ($self, $value) = @_;	776	my ($self, $value) = @_;
760	$CFG->{password} = $value;	777	$CFG->{password} = $value;
761	}	778	}
762	);	779	);
763		780
…		…
767	range => [$CFG->{mapsize}, 10, 100, 0, 1],	784	range => [$CFG->{mapsize}, 10, 100, 0, 1],
768	tooltip => "This is the size of the portion of the map update the server sends you. "	785	tooltip => "This is the size of the portion of the map update the server sends you. "
769	. "If you set this to a high value you will be able to see further, "	786	. "If you set this to a high value you will be able to see further, "
770	. "but you also increase bandwidth requirements and latency. "	787	. "but you also increase bandwidth requirements and latency. "
771	. "This option is only used once at log-in.",	788	. "This option is only used once at log-in.",
772	connect_changed => sub {	789	on_changed => sub {
773	my ($self, $value) = @_;	790	my ($self, $value) = @_;
774		791
775	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	792	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
776	},	793	},
777	);	794	);
…		…
784	. "This might increase or create lag, but increases the chances "	801	. "This might increase or create lag, but increases the chances "
785	. "of faces being ready for display when you encounter them. "	802	. "of faces being ready for display when you encounter them. "
786	. "It also uses up server bandwidth on every connect, "	803	. "It also uses up server bandwidth on every connect, "
787	. "so only set it if you really need to prefetch images. "	804	. "so only set it if you really need to prefetch images. "
788	. "This option can be set and unset any time.",	805	. "This option can be set and unset any time.",
789	connect_changed => sub { $CFG->{face_prefetch} = $_[1] },	806	on_changed => sub { $CFG->{face_prefetch} = $_[1] },
790	);	807	);
791		808
792	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	809	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
793	$table->add (1, 9, new CFClient::UI::Entry	810	$table->add (1, 9, new CFClient::UI::Entry
794	text => $CFG->{output_count},	811	text => $CFG->{output_count},
795	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	812	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
796	connect_changed => sub { $CFG->{output_count} = $_[1] },	813	on_changed => sub { $CFG->{output_count} = $_[1] },
797	);	814	);
798		815
799	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	816	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
800	$table->add (1, 10, new CFClient::UI::Entry	817	$table->add (1, 10, new CFClient::UI::Entry
801	text => $CFG->{output_sync},	818	text => $CFG->{output_sync},
802	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	819	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
803	connect_changed => sub { $CFG->{output_sync} = $_[1] },	820	on_changed => sub { $CFG->{output_sync} = $_[1] },
804	);	821	);
805		822
806	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	823	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
807	expand => 1,	824	expand => 1,
808	align => 0,	825	align => 0,
809	text => "Login",	826	text => "Login",
810	connect_activate => sub {	827	on_activate => sub {
811	$CONN ? stop_game	828	$CONN ? stop_game
812	: start_game;	829	: start_game;
813	},	830	},
814	);	831	);
815		832
816	$dialog	833	$dialog
817	}	834	}
818		835
819	sub message_window {	836	sub message_window {
820	my $window = new CFClient::UI::FancyFrame	837	my $window = new CFClient::UI::FancyFrame
		838	name => "message_window",
821	title => "Messages",	839	title => "Messages",
822	border_bg => [1, 1, 1, 1],	840	border_bg => [1, 1, 1, 1],
823	bg => [0, 0, 0, 0.75],	841	bg => [0, 0, 0, 0.75],
		842	req_x => -1,
		843	req_y => 0,
824	user_w => int $::WIDTH / 3,	844	def_w => int $::WIDTH / 3,
825	user_h => int $::HEIGHT / 5,	845	def_h => int $::HEIGHT / 5,
826	child => (my $vbox = new CFClient::UI::VBox);	846	child => (my $vbox = new CFClient::UI::VBox);
827		847
828	$vbox->add ($LOGVIEW);	848	$vbox->add ($LOGVIEW);
829		849
830	$vbox->add (my $input = new CFClient::UI::Entry	850	$vbox->add (my $input = new CFClient::UI::Entry
831	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	851	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
832	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	852	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
833	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	853	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
834	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	854	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
835	connect_focus_in => sub {	855	on_focus_in => sub {
836	my ($input, $prev_focus) = @_;	856	my ($input, $prev_focus) = @_;
837		857
838	delete $input->{refocus_map};	858	delete $input->{refocus_map};
839		859
840	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	860	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
841	$input->{refocus_map} = 1;	861	$input->{refocus_map} = 1;
842	}	862	}
843	delete $input->{auto_activated};	863	delete $input->{auto_activated};
844	},	864	},
845	connect_activate => sub {	865	on_activate => sub {
846	my ($input, $text) = @_;	866	my ($input, $text) = @_;
847	$input->set_text ('');	867	$input->set_text ('');
848		868
849	if ($text =~ /^\/(.*)/) {	869	if ($text =~ /^\/(.*)/) {
850	$::CONN->user_send ($1);	870	$::CONN->user_send ($1);
…		…
855	if ($input->{refocus_map}) {	875	if ($input->{refocus_map}) {
856	delete $input->{refocus_map};	876	delete $input->{refocus_map};
857	$MAPWIDGET->focus_in	877	$MAPWIDGET->focus_in
858	}	878	}
859	},	879	},
860	connect_escape => sub {	880	on_escape => sub {
861	$MAPWIDGET->focus_in	881	$MAPWIDGET->focus_in
862	},	882	},
863	);	883	);
864		884
865	$CONSOLE = {	885	$CONSOLE = {
…		…
870	$window	890	$window
871	}	891	}
872		892
873	sub open_quit_dialog {	893	sub open_quit_dialog {
874	unless ($QUIT_DIALOG) {	894	unless ($QUIT_DIALOG) {
875
876	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	895	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
877		896
878	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	897	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
879		898
880	$vb->add (new CFClient::UI::Label	899	$vb->add (new CFClient::UI::Label
…		…
884	);	903	);
885	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	904	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
886	$hb->add (new CFClient::UI::Button	905	$hb->add (new CFClient::UI::Button
887	text => "Ok",	906	text => "Ok",
888	expand => 1,	907	expand => 1,
889	connect_activate => sub { $QUIT_DIALOG->hide },	908	on_activate => sub { $QUIT_DIALOG->hide },
890	);	909	);
891	$hb->add (new CFClient::UI::Button	910	$hb->add (new CFClient::UI::Button
892	text => "Quit anyway",	911	text => "Quit anyway",
893	expand => 1,	912	expand => 1,
894	connect_activate => sub { exit },	913	on_activate => sub { exit },
895	);	914	);
		915	}
896		916
		917	$QUIT_DIALOG->show;
897	$QUIT_DIALOG->show_centered;	918	$QUIT_DIALOG->center;
898	} else {
899	$QUIT_DIALOG->show_centered;
900	}
901	}	919	}
902		920
903	sub make_inventory_window {	921	sub make_inventory_window {
904	my $invwin = new CFClient::UI::FancyFrame	922	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
905	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";	923	def_w => $WIDTH * 7/8,
		924	def_h => $HEIGHT * 7/8,
		925	title => "Inventory",
		926	name => "inventory_window",
		927	on_visibility_change => sub {
		928	my ($self, $visible) = @_;
		929	$self->center if $visible;
		930	},
		931	;
906		932
907	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	933	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
908		934
909	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	935	$hb->add (my $vb1 = new CFClient::UI::VBox);
910	$vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5);	936	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
911	$lbl->set_text ("Player");
912	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	937	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
913		938
914	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);	939	$hb->add (my $vb2 = new CFClient::UI::VBox);
		940
		941	$vb2->add (my $hb2 = new CFClient::UI::HBox);
915	$vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5);	942	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
916	$INVR_LBL->set_text ("Floor");	943	$hb2->add (new CFClient::UI::Button
		944	text => "Close",
		945	tooltip => "Close the currently open container (if one is open)",
		946	on_activate => sub {
		947	$CONN->send ("apply $CONN->{open_container}")
		948	if $CONN->{open_container} != 0;
		949	},
		950	);
		951
917	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	952	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
918		953
919	$invwin	954	$invwin
920	}	955	}
921		956
922	sub make_help_window {	957	sub make_help_window {
923	my $win = new CFClient::UI::FancyFrame	958	my $win = new CFClient::UI::FancyFrame
924	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	959	def_w => int $WIDTH * 7/8,
		960	def_h => int $HEIGHT * 7/8,
		961	title => "Documentation";
925		962
926	$win->add (my $vbox = new CFClient::UI::VBox);	963	$win->add (my $vbox = new CFClient::UI::VBox);
927		964
928	$vbox->add (my $buttons = new CFClient::UI::HBox);	965	$vbox->add (my $buttons = new CFClient::UI::HBox);
929	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	966	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
936	) {	973	) {
937	my ($pod, $label) = @$_;	974	my ($pod, $label) = @$_;
938		975
939	$buttons->add (new CFClient::UI::Button	976	$buttons->add (new CFClient::UI::Button
940	text => $label,	977	text => $label,
941	connect_activate => sub {	978	on_activate => sub {
942	my $parser = new Pod::POM;	979	my $parser = new Pod::POM;
943	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");	980	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
944		981
945	$viewer->clear;	982	$viewer->clear;
946		983
…		…
1054	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1091	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
1055		1092
1056	$BUTTONBAR->add (new CFClient::UI::Button	1093	$BUTTONBAR->add (new CFClient::UI::Button
1057	text => "Save Config",	1094	text => "Save Config",
1058	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1095	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1059	connect_activate => sub {	1096	on_activate => sub {
		1097	$::CFG->{layout} = CFClient::UI::get_layout;
1060	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1098	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
1061	status "Configuration Saved";	1099	status "Configuration Saved";
1062	},	1100	},
1063	);	1101	);
1064		1102
1065	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1103	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1066	tooltip => "View Documentation");	1104	tooltip => "View Documentation");
1067		1105
1068	$BUTTONBAR->add (new CFClient::UI::Button	1106	$BUTTONBAR->add (new CFClient::UI::Button
1069	text => "Quit",	1107	text => "Quit",
1070	tooltip => "Terminates the program",	1108	tooltip => "Terminates the program",
1071	connect_activate => sub {	1109	on_activate => sub {
1072	if ($CONN) {	1110	if ($CONN) {
1073	open_quit_dialog;	1111	open_quit_dialog;
1074	} else {	1112	} else {
1075	exit;	1113	exit;
1076	}	1114	}
…		…
1079		1117
1080	$BUTTONBAR->show;	1118	$BUTTONBAR->show;
1081		1119
1082	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1120	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1083		1121
1084	# delay till geometry is constant	1122	$SERVER_SETUP->show;
1085	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
1086	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1087	my $widget = $GAUGES->{win};
1088	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1089	});
1090	force_refresh ();
1091	}	1123	}
1092	}	1124	}
1093		1125
1094	sub video_shutdown {	1126	sub video_shutdown {
1095	undef $SDL_ACTIVE;	1127	undef $SDL_ACTIVE;
…		…
1308		1340
1309	{	1341	{
1310	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1311		1343
1312	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
		1345	CFClient::UI::set_layout ($::CFG->{layout});
1313		1346
1314	my %DEF_CFG = (	1347	my %DEF_CFG = (
1315	sdl_mode => 0,	1348	sdl_mode => 0,
1316	width => 640,	1349	width => 640,
1317	height => 480,	1350	height => 480,

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.11 by root, Fri May 26 18:56:14 2006 UTC vs. Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.11 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC