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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.97 by root, Thu Apr 13 23:31:43 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC

…		…
21	our $VERSION = '0.1';	21	our $VERSION = '0.1';
22		22
23	my $MAX_FPS = 60;	23	my $MAX_FPS = 60;
24	my $MIN_FPS = 5; # unused as of yet	24	my $MIN_FPS = 5; # unused as of yet
25		25
		26	our $META_SERVER = "crossfire.real-time.com:13326";
		27
26	our $FACECACHE;	28	our $FACECACHE;
27		29
28	our $LAST_REFRESH;	30	our $LAST_REFRESH;
29	our $NOW;	31	our $NOW;
30		32
…		…
34		36
35	our @SDL_MODES;	37	our @SDL_MODES;
36	our $WIDTH;	38	our $WIDTH;
37	our $HEIGHT;	39	our $HEIGHT;
38	our $FULLSCREEN;	40	our $FULLSCREEN;
		41	our $FONTSIZE;
39		42
40	our $MAP;	43	our $MAP;
41	our $MAPWIDGET;	44	our $MAPWIDGET;
42	our $FONTSIZE;	45	our $BUTTONBAR;
		46	our $LOGVIEW;
		47	our $CONSOLE;
		48	our $METASERVER;
43		49
44	our $SDL_ACTIVE;	50	our $SDL_ACTIVE;
45	our $SDL_EV;	51	our $SDL_EV;
46	our %SDL_CB;	52	our %SDL_CB;
47		53
…		…
62	}	68	}
63		69
64	sub start_game {	70	sub start_game {
65	status "logging in...";	71	status "logging in...";
66		72
67	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	73	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
68		74
69	$MAP = new CFClient::Map $mapsize, $mapsize;	75	$MAP = new CFClient::Map $mapsize, $mapsize;
		76
		77	my ($host, $port) = split /:/, $CFG->{host};
70		78
71	$CONN = new conn	79	$CONN = new conn
72	host => $CFG->{host},	80	host => $host,
73	port => $CFG->{port},	81	port => $port \|\| 13327,
74	user => $CFG->{user},	82	user => $CFG->{user},
75	pass => $CFG->{password},	83	pass => $CFG->{password},
76	mapw => $mapsize,	84	mapw => $mapsize,
77	maph => $mapsize,	85	maph => $mapsize,
78	;	86	;
…		…
84		92
85	sub stop_game {	93	sub stop_game {
86	undef $CONN;	94	undef $CONN;
87	}	95	}
88		96
89	sub config_dialog {	97	sub client_setup {
90	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	98	my $dialog = new CFClient::UI::FancyFrame
91	child => (my $vbox = new CFClient::UI::VBox);	99	child => (my $vbox = new CFClient::UI::VBox);
92	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	100	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
93	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	101	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
94		102
95	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	103	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
134	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	142	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
135	my ($self, $value) = @_;	143	my ($self, $value) = @_;
136	$CFG->{fow_smooth} = $value;	144	$CFG->{fow_smooth} = $value;
137	});	145	});
138		146
		147	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		148	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		149	my ($self, $value) = @_;
		150	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		151	});
		152
139	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	153	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
140	destroy_screen ();	154	destroy_screen ();
141	init_screen ();	155	init_screen ();
142	});	156	});
		157
		158	$dialog
		159	}
		160
		161	sub metaserver_dialog {
		162	my $dialog = new CFClient::UI::FancyFrame
		163	child => (my $vbox = new CFClient::UI::VBox);
		164
		165	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		166
		167	$dialog
		168	}
		169
		170	sub update_metaserver {
		171	status "fetching metaserver list...";
		172
		173	my $buf;
		174
		175	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		176
		177	Event->io (fd => $fh, poll => 'r', cb => sub {
		178	my $res = sysread $fh, $buf, 8192, length $buf;
		179
		180	if (!defined $res) {
		181	$_[0]->w->cancel;
		182	status "metaserver: $!";
		183	} elsif ($res == 0) {
		184	$_[0]->w->cancel;
		185	status "server list retrieved";
		186	warn $buf;
		187	}
		188	});
		189	}
		190
		191	sub server_setup {
		192	my $dialog = new CFClient::UI::FancyFrame
		193	child => (my $vbox = new CFClient::UI::VBox);
143		194
144	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	195	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
145	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	196	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
146	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	197	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
147	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	198
148		199	{
149	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	200	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
150	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	201
		202	$vbox->add (new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		203	my ($self, $value) = @_;
		204	$CFG->{host} = $value;
		205	});
		206
		207	$METASERVER = metaserver_dialog;
		208
		209	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		210	update_metaserver;
		211	});
		212	}
151		213
152	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	214	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
153	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	215	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		216	my ($self, $value) = @_;
		217	$CFG->{user} = $value;
		218	});
154		219
155	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	220	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
156	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	221	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		222	my ($self, $value) = @_;
		223	$CFG->{password} = $value;
		224	});
157		225
		226	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		227	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		228	my ($self, $value) = @_;
		229	$CFG->{say_command} = $value;
		230	});
		231
158	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	232	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
159	$table->add (1, 6, new CFClient::UI::Slider	233	$table->add (1, 7, new CFClient::UI::Slider
160	req_w => 100,	234	req_w => 100,
161	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	235	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
162	connect_changed => sub {	236	connect_changed => sub {
163	my ($self, $value) = @_;	237	my ($self, $value) = @_;
164		238
165	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	239	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
166	},	240	},
167	);	241	);
168		242
169	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	243	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
170	start_game;	244	start_game;
171	});	245	});
172		246
173	$vbox->add (my $hbox = new CFClient::UI::HBox);	247	$dialog
		248	}
174		249
175	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	250	sub message_window {
176	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	251	my $window = new CFClient::UI::FancyFrame
177	status "Configuration Saved";	252	border_bg => [1, 1, 1, 0.5],
		253	bg => [0.3, 0.3, 0.3, 0.8],
		254	user_w => $::WIDTH/4,
		255	user_h => $::HEIGHT,
		256	child => (my $vbox = new CFClient::UI::VBox);
		257
		258	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		259	expand => 1,
		260	fontsize => $::CFG->{log_fontsize},
178	});	261	);
179	$CFClient::UI::TOPLEVEL->add ($dialog);	262
		263	$vbox->add (my $input = new CFClient::UI::LineEntry);
		264	$input->connect (activate => sub {
		265	my ($input, $text) = @_;
		266	$input->set_text ('');
		267
		268	if ($text =~ /^\/(.*)/) {
		269	$::CONN->user_send ("command $1");
		270	} else {
		271	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		272	$::CONN->user_send ("command $say_cmd $text");
		273	}
		274	1
		275	});
		276	$input->connect (escape => sub {
		277	$MAPWIDGET->focus_in
		278	});
		279	$input->focus_in;
		280
		281	$CONSOLE = {
		282	window => $window,
		283	input => $input
		284	};
		285
		286	$window
180	}	287	}
181		288
182	sub sdl_init {	289	sub sdl_init {
183	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	290	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		291	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
184	and die "SDL::Init failed!\n";	292	and die "SDL::Init failed!\n";
185	}	293	}
186		294
187	sub init_screen {	295	sub init_screen {
188	sdl_init;	296	sdl_init;
…		…
223		331
224	$FONTSIZE = int $HEIGHT / 40;	332	$FONTSIZE = int $HEIGHT / 40;
225		333
226	#############################################################################	334	#############################################################################
227		335
228	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	336	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
229	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	337	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
230		338
231	$STATUS_LINE = new CFClient::UI::Label	339	$STATUS_LINE = new CFClient::UI::Label
232	padding => 0,	340	padding => 0,
233	y => $HEIGHT * 49 / 50 - $FONTSIZE;	341	y => $HEIGHT * 44 / 45 - $FONTSIZE;
234	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	342	$CFClient::UI::ROOT->add ($STATUS_LINE);
235		343
236	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	344	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
237	padding => 0,	345	padding => 0,
238	y => $HEIGHT * 49 / 50,	346	y => $HEIGHT * 44 / 45,
239	height => $HEIGHT / 50,	347	height => $HEIGHT / 45,
240	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	348	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
241	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	349	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
242		350
243	$MAPWIDGET = new CFClient::UI::MapWidget;	351	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
244	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
245	$MAPWIDGET->focus_in;	352	$MAPWIDGET->focus_in;
		353	$MAPWIDGET->connect (activate_console => sub {
		354	my ($mapwidget, $preset) = @_;
246		355
247	config_dialog;	356	if ($CONSOLE) {
		357	$CONSOLE->{input}->focus_in;
		358
		359	if ($preset && $CONSOLE->{input}->get_text eq '') {
		360	$CONSOLE->{input}->set_text ($preset);
		361	}
		362	}
		363	});
		364
		365	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		366
		367	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		368	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		369	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		370
		371	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		372	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		373	status "Configuration Saved";
		374	});
		375
		376	$BUTTONBAR->{children}[0]->emit ("activate");
248	}	377	}
249		378
250	sub destroy_screen {	379	sub destroy_screen {
251	$CFClient::UI::TOPLEVEL->{children} = [];	380	$CFClient::UI::ROOT->{children} = [];
252	undef $SDL_ACTIVE;	381	undef $SDL_ACTIVE;
253	undef $SDL_EV;	382	undef $SDL_EV;
254	SDL::Quit;	383	SDL::Quit;
255	}	384	}
256		385
…		…
267	debug sprintf "%3.2f", $fps;	396	debug sprintf "%3.2f", $fps;
268		397
269	$want_refresh = 0;	398	$want_refresh = 0;
270	$can_refresh = 0;	399	$can_refresh = 0;
271		400
272	glViewport 0, 0, $WIDTH, $HEIGHT;
273
274	glMatrixMode GL_PROJECTION;
275	glLoadIdentity;
276	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
277	glMatrixMode GL_MODELVIEW;
278	glLoadIdentity;
279
280	glClearColor +($CFG->{fow_intensity}) x 3, 1;
281	glClear GL_COLOR_BUFFER_BIT;
282
283	$CFClient::UI::TOPLEVEL->draw;	401	$CFClient::UI::ROOT->draw;
284		402
285	SDL::GLSwapBuffers;	403	SDL::GLSwapBuffers;
286		404
287	$LAST_REFRESH = $NOW;	405	$LAST_REFRESH = $NOW;
288	}	406	}
…		…
361	sub conn::face_update {	479	sub conn::face_update {
362	my ($self, $facenum, $face) = @_;	480	my ($self, $facenum, $face) = @_;
363		481
364	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	482	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
365		483
366	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};	484	my $tex = $face->{texture} =
		485	new_from_image CFClient::Texture
		486	delete $face->{image}, minify => 1;
367		487
368	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});	488	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
369	$MAPWIDGET->update;	489	$MAPWIDGET->update;
370	}	490	}
371		491
372	sub conn::query {	492	sub conn::query {
373	my ($self, $flags, $prompt) = @_;	493	my ($self, $flags, $prompt) = @_;
374		494
		495	#TODO
375	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	496	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		497	}
		498
		499	sub conn::drawinfo {
		500	my ($self, $color, $text) = @_;
		501
		502	my @color = (
		503	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		504	[1.00, 1.00, 1.00],
		505	[0.00, 0.00, 0.55],
		506	[1.00, 0.00, 0.00],
		507	[1.00, 0.54, 0.00],
		508	[0.11, 0.56, 1.00],
		509	[0.93, 0.46, 0.00],
		510	[0.18, 0.54, 0.34],
		511	[0.56, 0.73, 0.56],
		512	[0.80, 0.80, 0.80],
		513	[0.55, 0.41, 0.13],
		514	[0.99, 0.77, 0.26],
		515	[0.74, 0.65, 0.41],
		516	);
		517
		518	$LOGVIEW->add_paragraph ($color[$color], $text);
376	}	519	}
377		520
378	%SDL_CB = (	521	%SDL_CB = (
379	SDL_QUIT() => sub {	522	SDL_QUIT() => sub {
380	Event::unloop -1;	523	Event::unloop -1;
…		…
385	refresh;	528	refresh;
386	},	529	},
387	SDL_KEYDOWN() => sub {	530	SDL_KEYDOWN() => sub {
388	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	531	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
389	# alt-enter	532	# alt-enter
390	$FULLSCREEN = !$FULLSCREEN;
391	destroy_screen;	533	destroy_screen;
		534	$CFG->{fullscreen} = !$CFG->{fullscreen};
392	init_screen;	535	init_screen;
393	} else {	536	} else {
394	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	537	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
395	}	538	}
396	},	539	},
…		…
414	#############################################################################	557	#############################################################################
415		558
416	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	559	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
417		560
418	my %DEF_CFG = (	561	my %DEF_CFG = (
		562	sdl_mode => 0,
419	width => 640,	563	width => 640,
420	height => 480,	564	height => 480,
		565	fullscreen => 0,
421	fast => 0,	566	fast => 0,
422	fow_enable => 1,	567	fow_enable => 1,
423	fow_intensity => 0.45,	568	fow_intensity => 0.45,
424	fow_smooth => 0,	569	fow_smooth => 0,
425	fullscreen => 0,	570	log_fontsize => 14,
426	sdl_mode => 0,
427	mapsize => 100,	571	mapsize => 100,
428	host => "crossfire.schmorp.de",	572	host => "crossfire.schmorp.de",
429	port => 13327,	573	say_command => 'say',
430	);	574	);
431		575
432	while (my ($k, $v) = each %DEF_CFG) {	576	while (my ($k, $v) = each %DEF_CFG) {
433	$CFG->{$k} = $v unless exists $CFG->{$k};	577	$CFG->{$k} = $v unless exists $CFG->{$k};
434	}	578	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.97 by root, Thu Apr 13 23:31:43 2006 UTC vs. Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.97 by root, Thu Apr 13 23:31:43 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC