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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.96 by root, Thu Apr 13 23:11:11 2006 UTC vs.
Revision 1.111 by root, Sat Apr 15 12:46:48 2006 UTC

…		…
34		34
35	our @SDL_MODES;	35	our @SDL_MODES;
36	our $WIDTH;	36	our $WIDTH;
37	our $HEIGHT;	37	our $HEIGHT;
38	our $FULLSCREEN;	38	our $FULLSCREEN;
		39	our $FONTSIZE;
39		40
40	our $MAP;	41	our $MAP;
41	our $MAPWIDGET;	42	our $MAPWIDGET;
42	our $FONTSIZE;
43		43
44	our $SDL_ACTIVE;	44	our $SDL_ACTIVE;
45	our $SDL_EV;	45	our $SDL_EV;
46	our %SDL_CB;	46	our %SDL_CB;
47		47
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;
		52	our $LOGVIEW;
		53	our $CONSOLE;
51		54
52	sub status {	55	sub status {
53	$STATUS_LINE->set_text ($_[0]);	56	$STATUS_LINE->set_text ($_[0]);
54	my ($w, $h) = $STATUS_LINE->size_request;	57	my ($w, $h) = $STATUS_LINE->size_request;
55	$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);
…		…
62	}	65	}
63		66
64	sub start_game {	67	sub start_game {
65	status "logging in...";	68	status "logging in...";
66		69
67	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;
68		71
69	$MAP = new CFClient::Map $mapsize, $mapsize;	72	$MAP = new CFClient::Map $mapsize, $mapsize;
70		73
71	$CONN = new conn	74	$CONN = new conn
72	host => $CFG->{host},	75	host => $CFG->{host},
…		…
84		87
85	sub stop_game {	88	sub stop_game {
86	undef $CONN;	89	undef $CONN;
87	}	90	}
88		91
89	sub config_dialog {	92	sub client_setup {
90	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	93	my $dialog = new CFClient::UI::FancyFrame
91	child => (my $vbox = new CFClient::UI::VBox);	94	child => (my $vbox = new CFClient::UI::VBox);
92	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	95	$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]);	96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
94		97
95	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	98	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
117	my ($self, $value) = @_;	120	my ($self, $value) = @_;
118	$CFG->{fast} = $value;	121	$CFG->{fast} = $value;
119	});	122	});
120		123
121	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	124	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		125	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		126	my ($self, $value) = @_;
		127	$CFG->{fow_enable} = $value;
		128	});
		129
		130	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
122	$table->add (1, 3, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	131	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
123	my ($self, $value) = @_;	132	my ($self, $value) = @_;
124	$CFG->{fow_intensity} = $value;	133	$CFG->{fow_intensity} = $value;
125	});	134	});
126		135
127	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW");	136	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
128	$table->add (1, 4, 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 {
129	my ($self, $value) = @_;	138	my ($self, $value) = @_;
130	$CFG->{fow_smooth} = $value;	139	$CFG->{fow_smooth} = $value;
131	});	140	});
132		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
133	$table->add (1, 5, 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 {
134	destroy_screen ();	149	destroy_screen ();
135	init_screen ();	150	init_screen ();
136	});	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);
137		159
138	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	160	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
139	$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]);
140	$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");
141	$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 {
142		164	my ($self, $value) = @_;
		165	$CFG->{host} = $value;
		166	});
		167
143	$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");
144	$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	});
145		173
146	$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");
147	$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	});
148		179
149	$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");
150	$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	});
151		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
152	$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");
153	$table->add (1, 6, new CFClient::UI::Slider	193	$table->add (1, 7, new CFClient::UI::Slider
154	req_w => 100,	194	req_w => 100,
155	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	195	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
156	connect_changed => sub {	196	connect_changed => sub {
157	my ($self, $value) = @_;	197	my ($self, $value) = @_;
158		198
159	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	199	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
160	},	200	},
161	);	201	);
162		202
163	$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 {
164	start_game;	204	start_game;
165	});	205	});
166		206
167	$vbox->add (my $hbox = new CFClient::UI::HBox);	207	$dialog
		208	}
168		209
169	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	210	sub message_window {
170	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	211	my $window = new CFClient::UI::FancyFrame
171	status "Configuration Saved";	212	border_bg => [1, 1, 1, 0.5],
		213	bg => [0.3, 0.3, 0.3, 0.8],
		214	user_w => $::WIDTH/4,
		215	user_h => $::HEIGHT,
		216	child => (my $vbox = new CFClient::UI::VBox);
		217
		218	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		219	expand => 1,
		220	fontsize => $::CFG->{log_fontsize},
172	});	221	);
173	$CFClient::UI::TOPLEVEL->add ($dialog);	222
		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	};
		245
		246	$window
174	}	247	}
175		248
176	sub sdl_init {	249	sub sdl_init {
177	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	250	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		251	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
178	and die "SDL::Init failed!\n";	252	and die "SDL::Init failed!\n";
179	}	253	}
180		254
181	sub init_screen {	255	sub init_screen {
182	sdl_init;	256	sdl_init;
…		…
217		291
218	$FONTSIZE = int $HEIGHT / 40;	292	$FONTSIZE = int $HEIGHT / 40;
219		293
220	#############################################################################	294	#############################################################################
221		295
222	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	296	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
223	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	297	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
224		298
225	$STATUS_LINE = new CFClient::UI::Label	299	$STATUS_LINE = new CFClient::UI::Label
226	padding => 0,	300	padding => 0,
227	y => $HEIGHT * 49 / 50 - $FONTSIZE;	301	y => $HEIGHT * 44 / 45 - $FONTSIZE;
228	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	302	$CFClient::UI::ROOT->add ($STATUS_LINE);
229		303
230	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	304	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
231	padding => 0,	305	padding => 0,
232	y => $HEIGHT * 49 / 50,	306	y => $HEIGHT * 44 / 45,
233	height => $HEIGHT / 50,	307	height => $HEIGHT / 45,
234	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	308	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
235	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	309	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
236		310
237	$MAPWIDGET = new CFClient::UI::MapWidget;	311	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
238	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
239	$MAPWIDGET->focus_in;	312	$MAPWIDGET->focus_in;
		313	$MAPWIDGET->connect (activate_console => sub {
		314	my ($mapwidget, $preset) = @_;
240		315
241	config_dialog;	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
		325	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		326
		327	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		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");
242	}	337	}
243		338
244	sub destroy_screen {	339	sub destroy_screen {
245	$CFClient::UI::TOPLEVEL->{children} = [];	340	$CFClient::UI::ROOT->{children} = [];
246	undef $SDL_ACTIVE;	341	undef $SDL_ACTIVE;
247	undef $SDL_EV;	342	undef $SDL_EV;
248	SDL::Quit;	343	SDL::Quit;
249	}	344	}
250		345
…		…
261	debug sprintf "%3.2f", $fps;	356	debug sprintf "%3.2f", $fps;
262		357
263	$want_refresh = 0;	358	$want_refresh = 0;
264	$can_refresh = 0;	359	$can_refresh = 0;
265		360
266	glViewport 0, 0, $WIDTH, $HEIGHT;
267
268	glMatrixMode GL_PROJECTION;
269	glLoadIdentity;
270	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
271	glMatrixMode GL_MODELVIEW;
272	glLoadIdentity;
273
274	glClearColor +($CFG->{fow_intensity}) x 3, 1;
275	glClear GL_COLOR_BUFFER_BIT;
276
277	$CFClient::UI::TOPLEVEL->draw;	361	$CFClient::UI::ROOT->draw;
278		362
279	SDL::GLSwapBuffers;	363	SDL::GLSwapBuffers;
280		364
281	$LAST_REFRESH = $NOW;	365	$LAST_REFRESH = $NOW;
282	}	366	}
…		…
355	sub conn::face_update {	439	sub conn::face_update {
356	my ($self, $facenum, $face) = @_;	440	my ($self, $facenum, $face) = @_;
357		441
358	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	442	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
359		443
360	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;
361		447
362	$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}});
363	$MAPWIDGET->update;	449	$MAPWIDGET->update;
364	}	450	}
365		451
366	sub conn::query {	452	sub conn::query {
367	my ($self, $flags, $prompt) = @_;	453	my ($self, $flags, $prompt) = @_;
368		454
		455	#TODO
369	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	456	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		457	}
		458
		459	sub conn::drawinfo {
		460	my ($self, $color, $text) = @_;
		461
		462	my @color = (
		463	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		464	[1.00, 1.00, 1.00],
		465	[0.00, 0.00, 0.55],
		466	[1.00, 0.00, 0.00],
		467	[1.00, 0.54, 0.00],
		468	[0.11, 0.56, 1.00],
		469	[0.93, 0.46, 0.00],
		470	[0.18, 0.54, 0.34],
		471	[0.56, 0.73, 0.56],
		472	[0.80, 0.80, 0.80],
		473	[0.55, 0.41, 0.13],
		474	[0.99, 0.77, 0.26],
		475	[0.74, 0.65, 0.41],
		476	);
		477
		478	$LOGVIEW->add_paragraph ($color[$color], $text);
370	}	479	}
371		480
372	%SDL_CB = (	481	%SDL_CB = (
373	SDL_QUIT() => sub {	482	SDL_QUIT() => sub {
374	Event::unloop -1;	483	Event::unloop -1;
…		…
379	refresh;	488	refresh;
380	},	489	},
381	SDL_KEYDOWN() => sub {	490	SDL_KEYDOWN() => sub {
382	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	491	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
383	# alt-enter	492	# alt-enter
384	$FULLSCREEN = !$FULLSCREEN;
385	destroy_screen;	493	destroy_screen;
		494	$CFG->{fullscreen} = !$CFG->{fullscreen};
386	init_screen;	495	init_screen;
387	} else {	496	} else {
388	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	497	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
389	}	498	}
390	},	499	},
…		…
408	#############################################################################	517	#############################################################################
409		518
410	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	519	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
411		520
412	my %DEF_CFG = (	521	my %DEF_CFG = (
		522	sdl_mode => 0,
413	width => 640,	523	width => 640,
414	height => 480,	524	height => 480,
		525	fullscreen => 0,
415	fast => 0,	526	fast => 0,
		527	fow_enable => 1,
416	fow_intensity => 0.45,	528	fow_intensity => 0.45,
417	fow_smooth => 0,	529	fow_smooth => 0,
418	fullscreen => 0,	530	log_fontsize => 14,
419	sdl_mode => 0,
420	mapsize => 100,	531	mapsize => 100,
421	host => "crossfire.schmorp.de",	532	host => "crossfire.schmorp.de",
422	port => 13327,	533	port => 13327,
		534	say_command => 'say',
423	);	535	);
424		536
425	while (my ($k, $v) = each %DEF_CFG) {	537	while (my ($k, $v) = each %DEF_CFG) {
426	$CFG->{$k} = $v unless exists $CFG->{$k};	538	$CFG->{$k} = $v unless exists $CFG->{$k};
427	}	539	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.96 by root, Thu Apr 13 23:11: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.96 by root, Thu Apr 13 23:11:11 2006 UTC vs.
Revision 1.111 by root, Sat Apr 15 12:46:48 2006 UTC