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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.99 by root, Fri Apr 14 02:03:11 2006 UTC vs.
Revision 1.111 by root, Sat Apr 15 12:46:48 2006 UTC

…		…
48	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	49	our $STATUS_LINE;
50	our $DEBUG_STATUS;	50	our $DEBUG_STATUS;
51	our $BUTTONBAR;	51	our $BUTTONBAR;
52	our $LOGVIEW;	52	our $LOGVIEW;
		53	our $CONSOLE;
53		54
54	sub status {	55	sub status {
55	$STATUS_LINE->set_text ($_[0]);	56	$STATUS_LINE->set_text ($_[0]);
56	my ($w, $h) = $STATUS_LINE->size_request;	57	my ($w, $h) = $STATUS_LINE->size_request;
57	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	58	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
…		…
64	}	65	}
65		66
66	sub start_game {	67	sub start_game {
67	status "logging in...";	68	status "logging in...";
68		69
69	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	70	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
70		71
71	$MAP = new CFClient::Map $mapsize, $mapsize;	72	$MAP = new CFClient::Map $mapsize, $mapsize;
72		73
73	$CONN = new conn	74	$CONN = new conn
74	host => $CFG->{host},	75	host => $CFG->{host},
…		…
86		87
87	sub stop_game {	88	sub stop_game {
88	undef $CONN;	89	undef $CONN;
89	}	90	}
90		91
91	sub config_dialog {	92	sub client_setup {
92	my $dialog = new CFClient::UI::FancyFrame	93	my $dialog = new CFClient::UI::FancyFrame
93	child => (my $vbox = new CFClient::UI::VBox);	94	child => (my $vbox = new CFClient::UI::VBox);
94	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
95	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
96		97
…		…
136	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	137	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
137	my ($self, $value) = @_;	138	my ($self, $value) = @_;
138	$CFG->{fow_smooth} = $value;	139	$CFG->{fow_smooth} = $value;
139	});	140	});
140		141
		142	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		143	$table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		144	my ($self, $value) = @_;
		145	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		146	});
		147
141	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	148	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
142	destroy_screen ();	149	destroy_screen ();
143	init_screen ();	150	init_screen ();
144	});	151	});
		152
		153	$dialog
		154	}
		155
		156	sub server_setup {
		157	my $dialog = new CFClient::UI::FancyFrame
		158	child => (my $vbox = new CFClient::UI::VBox);
145		159
146	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	160	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
147	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	161	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
148	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	162	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
149	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	163	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
150		164	my ($self, $value) = @_;
		165	$CFG->{host} = $value;
		166	});
		167
151	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	168	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
152	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	169	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
		170	my ($self, $value) = @_;
		171	$CFG->{port} = $value;
		172	});
153		173
154	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	174	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
155	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	175	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		176	my ($self, $value) = @_;
		177	$CFG->{user} = $value;
		178	});
156		179
157	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	180	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
158	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	181	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		182	my ($self, $value) = @_;
		183	$CFG->{password} = $value;
		184	});
159		185
		186	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		187	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		188	my ($self, $value) = @_;
		189	$CFG->{say_command} = $value;
		190	});
		191
160	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	192	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
161	$table->add (1, 6, new CFClient::UI::Slider	193	$table->add (1, 7, new CFClient::UI::Slider
162	req_w => 100,	194	req_w => 100,
163	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	195	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
164	connect_changed => sub {	196	connect_changed => sub {
165	my ($self, $value) = @_;	197	my ($self, $value) = @_;
166		198
167	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	199	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
168	},	200	},
169	);	201	);
170		202
171	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	203	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
172	start_game;	204	start_game;
173	});	205	});
174		206
175	$vbox->add (my $hbox = new CFClient::UI::HBox);
176
177	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
178	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
179	status "Configuration Saved";
180	});
181
182	$dialog	207	$dialog
183	}	208	}
184		209
185	sub console_window {	210	sub message_window {
186	my $window = new CFClient::UI::FancyFrame	211	my $window = new CFClient::UI::FancyFrame
187	border_bg => [1, 1, 1, 0.5],	212	border_bg => [1, 1, 1, 0.5],
188	bg => [0.3, 0.3, 0.3, 0.8],	213	bg => [0.3, 0.3, 0.3, 0.8],
		214	user_w => $::WIDTH/4,
		215	user_h => $::HEIGHT,
189	child => (my $vbox = new CFClient::UI::VBox);	216	child => (my $vbox = new CFClient::UI::VBox);
190		217
191	$vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);	218	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		219	expand => 1,
		220	fontsize => $::CFG->{log_fontsize},
		221	);
		222
192	$vbox->add (my $input = new CFClient::UI::Entry);	223	$vbox->add (my $input = new CFClient::UI::LineEntry);
		224	$input->connect (activate => sub {
		225	my ($input, $text) = @_;
		226	$input->set_text ('');
		227
		228	if ($text =~ /^\/(.*)/) {
		229	$::CONN->user_send ("command $1");
		230	} else {
		231	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		232	$::CONN->user_send ("command $say_cmd $text");
		233	}
		234	1
		235	});
		236	$input->connect (escape => sub {
		237	$MAPWIDGET->focus_in
		238	});
		239	$input->focus_in;
		240
		241	$CONSOLE = {
		242	window => $window,
		243	input => $input
		244	};
193		245
194	$window	246	$window
195	}	247	}
196		248
197	sub sdl_init {	249	sub sdl_init {
		250	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
198	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO	251	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
199	and die "SDL::Init failed!\n";	252	and die "SDL::Init failed!\n";
200	}	253	}
201		254
202	sub init_screen {	255	sub init_screen {
…		…
239	$FONTSIZE = int $HEIGHT / 40;	292	$FONTSIZE = int $HEIGHT / 40;
240		293
241	#############################################################################	294	#############################################################################
242		295
243	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	296	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
244	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	297	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
245		298
246	$STATUS_LINE = new CFClient::UI::Label	299	$STATUS_LINE = new CFClient::UI::Label
247	padding => 0,	300	padding => 0,
248	y => $HEIGHT * 44 / 45 - $FONTSIZE;	301	y => $HEIGHT * 44 / 45 - $FONTSIZE;
249	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	302	$CFClient::UI::ROOT->add ($STATUS_LINE);
250		303
251	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	304	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
252	padding => 0,	305	padding => 0,
253	y => $HEIGHT * 44 / 45,	306	y => $HEIGHT * 44 / 45,
254	height => $HEIGHT / 45,	307	height => $HEIGHT / 45,
255	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	308	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
256	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	309	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
257		310
258	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);	311	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
259	$MAPWIDGET->focus_in;	312	$MAPWIDGET->focus_in;
		313	$MAPWIDGET->connect (activate_console => sub {
		314	my ($mapwidget, $preset) = @_;
260		315
		316	if ($CONSOLE) {
		317	$CONSOLE->{input}->focus_in;
		318
		319	if ($preset && $CONSOLE->{input}->get_text eq '') {
		320	$CONSOLE->{input}->set_text ($preset);
		321	}
		322	}
		323	});
		324
261	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);	325	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
262		326
263	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);	327	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
264	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);	328	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		329	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		330
		331	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		332	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		333	status "Configuration Saved";
		334	});
		335
		336	$BUTTONBAR->{children}[0]->emit ("activate");
265	}	337	}
266		338
267	sub destroy_screen {	339	sub destroy_screen {
268	$CFClient::UI::TOPLEVEL->{children} = [];	340	$CFClient::UI::ROOT->{children} = [];
269	undef $SDL_ACTIVE;	341	undef $SDL_ACTIVE;
270	undef $SDL_EV;	342	undef $SDL_EV;
271	SDL::Quit;	343	SDL::Quit;
272	}	344	}
273		345
…		…
284	debug sprintf "%3.2f", $fps;	356	debug sprintf "%3.2f", $fps;
285		357
286	$want_refresh = 0;	358	$want_refresh = 0;
287	$can_refresh = 0;	359	$can_refresh = 0;
288		360
289	glViewport 0, 0, $WIDTH, $HEIGHT;
290
291	glMatrixMode GL_PROJECTION;
292	glLoadIdentity;
293	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
294	glMatrixMode GL_MODELVIEW;
295	glLoadIdentity;
296
297	glClearColor +($CFG->{fow_intensity}) x 3, 1;
298	glClear GL_COLOR_BUFFER_BIT;
299
300	$CFClient::UI::TOPLEVEL->draw;	361	$CFClient::UI::ROOT->draw;
301		362
302	SDL::GLSwapBuffers;	363	SDL::GLSwapBuffers;
303		364
304	$LAST_REFRESH = $NOW;	365	$LAST_REFRESH = $NOW;
305	}	366	}
…		…
378	sub conn::face_update {	439	sub conn::face_update {
379	my ($self, $facenum, $face) = @_;	440	my ($self, $facenum, $face) = @_;
380		441
381	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	442	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
382		443
383	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};	444	my $tex = $face->{texture} =
		445	new_from_image CFClient::Texture
		446	delete $face->{image}, minify => 1;
384		447
385	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});	448	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
386	$MAPWIDGET->update;	449	$MAPWIDGET->update;
387	}	450	}
388		451
389	sub conn::query {	452	sub conn::query {
390	my ($self, $flags, $prompt) = @_;	453	my ($self, $flags, $prompt) = @_;
…		…
454	#############################################################################	517	#############################################################################
455		518
456	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	519	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
457		520
458	my %DEF_CFG = (	521	my %DEF_CFG = (
		522	sdl_mode => 0,
459	width => 640,	523	width => 640,
460	height => 480,	524	height => 480,
		525	fullscreen => 0,
461	fast => 0,	526	fast => 0,
462	fow_enable => 1,	527	fow_enable => 1,
463	fow_intensity => 0.45,	528	fow_intensity => 0.45,
464	fow_smooth => 0,	529	fow_smooth => 0,
465	fullscreen => 0,	530	log_fontsize => 14,
466	sdl_mode => 0,
467	mapsize => 100,	531	mapsize => 100,
468	host => "crossfire.schmorp.de",	532	host => "crossfire.schmorp.de",
469	port => 13327,	533	port => 13327,
		534	say_command => 'say',
470	);	535	);
471		536
472	while (my ($k, $v) = each %DEF_CFG) {	537	while (my ($k, $v) = each %DEF_CFG) {
473	$CFG->{$k} = $v unless exists $CFG->{$k};	538	$CFG->{$k} = $v unless exists $CFG->{$k};
474	}	539	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.99 by root, Fri Apr 14 02:03:11 2006 UTC vs. Revision 1.111 by root, Sat Apr 15 12:46:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.99 by root, Fri Apr 14 02:03:11 2006 UTC vs.
Revision 1.111 by root, Sat Apr 15 12:46:48 2006 UTC