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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.16 by elmex, Fri Apr 7 17:37:11 2006 UTC vs.
Revision 1.91 by root, Wed Apr 12 23:15:39 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
2	use strict;	3	use strict;
		4	use utf8;
3		5
4	use Glib;	6	use Time::HiRes 'time';
5	use Gtk2 -init;	7	use Event;
6		8
7	use SDL;	9	use SDL;
8	use SDL::App;	10	use SDL::App;
9	use SDL::Event;	11	use SDL::Event;
10	use SDL::Surface;	12	use SDL::Surface;
11	use SDL::OpenGL;	13	use SDL::OpenGL;
12	use SDL::OpenGL::Constants;
13		14
14	use Crossfire;	15	use Crossfire;
15	use Crossfire::Client;
16	use Crossfire::Protocol;	16	use Crossfire::Protocol;
17		17
		18	use CFClient;
18	use Client::Util;	19	use CFClient::UI;
19	use Client::Widget;
20		20
21	our $VERSION = '0.1';	21	our $VERSION = '0.1';
		22
		23	my $MAX_FPS = 60;
		24	my $MIN_FPS = 5; # unused as of yet
		25
		26	our $FACECACHE;
		27
		28	our $LAST_REFRESH;
		29	our $NOW;
22		30
23	our $CFG;	31	our $CFG;
24	our $CONN;	32	our $CONN;
		33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
25		34
		35	our @SDL_MODES;
		36	our $WIDTH;
		37	our $HEIGHT;
		38	our $FULLSCREEN;
		39
		40	our $MAPWIDGET;
		41	our $FONTSIZE;
		42
26	our $SDL_TIMER;	43	our $SDL_ACTIVE;
27	our $SDL_APP;	44	our $SDL_EV;
28	our $SDL_EV = new SDL::Event;
29	our %SDL_CB;	45	our %SDL_CB;
30		46
		47	our $ALT_ENTER_MESSAGE;
		48	our $STATUS_LINE;
		49	our $DEBUG_STATUS;
		50
		51	sub status {
		52	$STATUS_LINE->set_text ($_[0]);
		53	my ($w, $h) = $STATUS_LINE->size_request;
		54	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
		55	}
		56
		57	sub debug {
		58	$DEBUG_STATUS->set_text ($_[0]);
		59	my ($w, $h) = $DEBUG_STATUS->size_request;
		60	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
		61	}
		62
		63	sub start_game {
		64	status "logging in...";
		65
		66	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		67
		68	$CONN = new conn
		69	host => $CFG->{host},
		70	port => $CFG->{port},
		71	user => $CFG->{user},
		72	pass => $CFG->{password},
		73	mapw => $mapsize,
		74	maph => $mapsize,
		75	;
		76
		77	status "login successful";
		78
		79	CFClient::lowdelay fileno $CONN->{fh};
		80	}
		81
		82	sub stop_game {
		83	undef $CONN;
		84	}
		85
		86	sub config_dialog {
		87	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
		88	child => (my $vbox = new CFClient::UI::VBox);
		89	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
		90	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		91
		92	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		93	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		94
		95	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		96	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		97
		98	$mode_slider->connect (changed => sub {
		99	my ($self, $value) = @_;
		100
		101	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		102	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		103	});
		104	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		105
		106	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		107	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		108	my ($self, $value) = @_;
		109	$CFG->{fullscreen} = $value;
		110	});
		111
		112	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		113	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		114	my ($self, $value) = @_;
		115	$CFG->{fast} = $value;
		116	});
		117
		118	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		119	$table->add (1, 3, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		120	my ($self, $value) = @_;
		121	$CFG->{fow_intensity} = $value;
		122	});
		123
		124	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW");
		125	$table->add (1, 4, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		126	my ($self, $value) = @_;
		127	$CFG->{fow_smooth} = $value;
		128	});
		129
		130	$table->add (1, 5, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		131	destroy_screen ();
		132	init_screen ();
		133	});
		134
		135	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
		136	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		137	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
		138	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
		139
		140	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
		141	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
		142
		143	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		144	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
		145
		146	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		147	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		148
		149	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
		150	$table->add (1, 6, new CFClient::UI::Slider
		151	req_w => 100,
		152	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		153	connect_changed => sub {
		154	my ($self, $value) = @_;
		155
		156	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		157	},
		158	);
		159
		160	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		161	start_game;
		162	});
		163
		164	$vbox->add (my $hbox = new CFClient::UI::HBox);
		165
		166	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		167	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		168	status "Configuration Saved";
		169	});
		170	$CFClient::UI::TOPLEVEL->add ($dialog);
		171	}
		172
		173	sub sdl_init {
		174	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		175	and die "SDL::Init failed!\n";
		176	}
		177
31	sub init_screen {	178	sub init_screen {
32	# nuke all gl context data	179	sdl_init;
		180
		181	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		182	$FULLSCREEN = $CFG->{fullscreen};
		183	$FAST = $CFG->{fast};
		184
		185	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
		186	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
		187	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
		188	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
		189
		190	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
		191	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
		192	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		193	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
		194
		195	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		196	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		197	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		198
		199	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		200	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		201	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		202	or die "SDL::SetVideoMode failed!\n";
		203
		204	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
		205
		206	$SDL_EV = new SDL::Event;
		207	$SDL_EV->set_unicode (1);
		208
		209	$SDL_ACTIVE = 1;
		210
		211	$LAST_REFRESH = time - 0.01;
		212
		213	CFClient::gl_init;
		214
		215	$FONTSIZE = int $HEIGHT / 40;
		216
		217	#############################################################################
		218
		219	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
		220	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
33		221
34	$SDL_APP = new SDL::App	222	$STATUS_LINE = new CFClient::UI::Label
35	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	223	padding => 0,
36	-title => "Crossfire+ Client",	224	y => $HEIGHT * 49 / 50 - $FONTSIZE;
37	-width => $CFG->{width},	225	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
38	-height => $CFG->{height},
39	-opengl => 1,
40	-red_size => 8,
41	-green_size => 8,
42	-blue_size => 8,
43	-double_buffer => 1,
44	-fullscreen => $CFG->{fullscreen},
45	-resizeable => 0;
46		226
47	glEnable GL_TEXTURE_2D;	227	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
48	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	228	padding => 0,
49	glShadeModel GL_FLAT;	229	y => $HEIGHT * 49 / 50,
50	glDisable GL_DEPTH_TEST;	230	height => $HEIGHT / 50,
51	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	231	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
52	glEnable GL_BLEND;	232	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		233
		234	$MAPWIDGET = new CFClient::UI::MapWidget;
		235	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
		236	$MAPWIDGET->focus_in;
		237
		238	config_dialog;
		239	}
		240
		241	sub destroy_screen {
		242	$CFClient::UI::TOPLEVEL->{children} = [];
		243	undef $SDL_ACTIVE;
		244	undef $SDL_EV;
		245	SDL::Quit;
		246	}
		247
		248	my %animate_object;
		249	my $animate_timer;
		250
		251	my $want_refresh;
		252	my $can_refresh;
		253
		254	my $fps = 9;
		255
		256	sub force_refresh {
		257	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		258	debug sprintf "%3.2f", $fps;
		259
		260	$want_refresh = 0;
		261	$can_refresh = 0;
		262
		263	glViewport 0, 0, $WIDTH, $HEIGHT;
53		264
54	glMatrixMode GL_PROJECTION;	265	glMatrixMode GL_PROJECTION;
55	glLoadIdentity;	266	glLoadIdentity;
56	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1;	267	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
		268	glMatrixMode GL_MODELVIEW;
		269	glLoadIdentity;
57		270
58	# re-bind all textures	271	glClearColor +($CFG->{fow_intensity}) x 3, 1;
59	}	272	glClear GL_COLOR_BUFFER_BIT;
60		273
61	sub start_game {	274	$CFClient::UI::TOPLEVEL->draw;
62	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	275
63	while ($SDL_EV->poll) {	276	SDL::GLSwapBuffers;
		277
		278	$LAST_REFRESH = $NOW;
		279	}
		280
		281	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		282	$NOW = time;
		283
64	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	284	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
65	}	285	while $SDL_EV->poll;
66		286
67	1	287	if (%animate_object) {
		288	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		289	$want_refresh++;
68	};	290	}
69		291
70	init_screen;	292	if ($want_refresh) {
71		293	force_refresh;
72	$CONN = new conn	294	} else {
73	host => $CFG->{host},	295	$can_refresh = 1;
74	port => $CFG->{port};	296	}
75	}	297	});
76
77	sub stop_game {
78	remove Glib::Source $SDL_TIMER;
79
80	undef $SDL_APP;
81	SDL::Quit;
82	}
83		298
84	sub refresh {	299	sub refresh {
85	glClearColor 0, 0, 0, 0;	300	$want_refresh++;
86	glClear GL_COLOR_BUFFER_BIT;	301	}
87		302
88	for (values %Client::Widget::ACTIVE_WIDGETS) {	303	sub animation_start {
89	$_->draw	304	my ($widget) = @_;
90	}	305	$animate_object{$widget} = $widget;
		306	}
91		307
92	SDL::GLSwapBuffers;	308	sub animation_stop {
		309	my ($widget) = @_;
		310	delete $animate_object{$widget};
		311	}
		312
		313	@conn::ISA = Crossfire::Protocol::;
		314
		315	sub conn::user_send {
		316	my ($self, $command) = @_;
		317
		318	$self->send ($command);
		319	status $command;
		320	}
		321
		322	sub conn::map_update {
		323	my ($self, $dirty) = @_;
		324
		325	$MAPWIDGET->update;
		326	}
		327
		328	sub conn::map_scroll {
		329	my ($self, $dx, $dy) = @_;
		330
		331	# refresh;
		332	}
		333
		334	sub conn::map_clear {
		335	my ($self) = @_;
		336
		337	# refresh;
		338	}
		339
		340	sub conn::face_find {
		341	my ($self, $face) = @_;
		342
		343	$FACECACHE->{"$face->{chksum},$face->{name}"}
		344	}
		345
		346	sub conn::face_update {
		347	my ($self, $face) = @_;
		348
		349	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		350
		351	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		352	}
		353
		354	sub conn::query {
		355	my ($self, $flags, $prompt) = @_;
		356
		357	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
93	}	358	}
94		359
95	%SDL_CB = (	360	%SDL_CB = (
96	SDL_QUIT() => sub {	361	SDL_QUIT() => sub {
97	warn "sdl quit\n";#d#	362	Event::unloop -1;
98	exit;
99	},	363	},
100	SDL_VIDEORESIZE() => sub {	364	SDL_VIDEORESIZE() => sub {
101	},	365	},
102	SDL_VIDEOEXPOSE() => sub {	366	SDL_VIDEOEXPOSE() => sub {
103	refresh;	367	refresh;
104	},	368	},
105	SDL_KEYDOWN() => sub {	369	SDL_KEYDOWN() => sub {
		370	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
		371	# alt-enter
		372	$FULLSCREEN = !$FULLSCREEN;
		373	destroy_screen;
		374	init_screen;
		375	} else {
106	Client::Widget::feed_sdl_key_down_event ($SDL_EV);	376	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
		377	}
107	},	378	},
108	SDL_KEYUP() => sub {	379	SDL_KEYUP() => sub {
109	Client::Widget::feed_sdl_key_up_event ($SDL_EV);	380	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
110	},	381	},
111	SDL_MOUSEMOTION() => sub {	382	SDL_MOUSEMOTION() => sub {
112	warn "sdl motion\n";#d#	383	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
113	},	384	},
114	SDL_MOUSEBUTTONDOWN() => sub {	385	SDL_MOUSEBUTTONDOWN() => sub {
115	Client::Widget::feed_sdl_button_down_event ($SDL_EV);	386	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
116	},	387	},
117	SDL_MOUSEBUTTONUP() => sub {	388	SDL_MOUSEBUTTONUP() => sub {
118	Client::Widget::feed_sdl_button_up_event ($SDL_EV);	389	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
119	},	390	},
120	SDL_ACTIVEEVENT() => sub {	391	SDL_ACTIVEEVENT() => sub {
121	warn "active\n";#d#	392	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
122	},	393	},
123	);	394	);
124		395
125	@conn::ISA = Crossfire::Protocol::;
126
127	sub conn::map_update {
128	my ($self, $dirty) = @_;
129
130	refresh;
131	}
132
133	sub conn::map_scroll {
134	my ($self, $dx, $dy) = @_;
135
136	refresh;
137	}
138
139	sub conn::map_clear {
140	my ($self) = @_;
141
142	refresh;
143	}
144
145	sub conn::face_update {
146	my ($self, $num, $face) = @_;
147
148	my $pb = new Gtk2::Gdk::PixbufLoader;
149	$pb->write ($face->{image});
150	$pb->close;
151
152	$pb = $pb->get_pixbuf;
153	$pb = $pb->add_alpha (0, 0, 0, 0);
154
155	glGetError();
156	my ($tex) = @{glGenTextures 1};
157
158	$face->{texture} = $tex;
159
160	glBindTexture GL_TEXTURE_2D, $tex;
161	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;
162
163	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
164	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
165	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
166	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
167
168	glTexImage2D GL_TEXTURE_2D, 0,
169	GL_RGBA8,
170	$pb->get_width, $pb->get_height,
171	0,
172	GL_RGBA,
173	GL_UNSIGNED_BYTE,
174	$pb->get_pixels;
175	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;
176	}
177
178	#############################################################################	396	#############################################################################
179		397
180	my $mapwidget = Client::MapWidget->new;
181
182	$mapwidget->activate;
183	$mapwidget->focus_in;
184
185	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	398	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
186		399
187	$CFG \|\|= {	400	my %DEF_CFG = (
188	width => 640,	401	width => 640,
189	height => 480,	402	height => 480,
		403	fast => 0,
		404	fow_intensity => 0.45,
		405	fow_smooth => 1,
190	fullscreen => 0,	406	fullscreen => 0,
		407	sdl_mode => 0,
		408	mapsize => 100,
191	host => "crossfire.schmorp.de",	409	host => "crossfire.schmorp.de",
192	port => 13327,	410	port => 13327,
193	};	411	);
194		412
195	Client::Util::run_config_dialog	413	while (my ($k, $v) = each %DEF_CFG) {
196	login => sub { start_game },	414	$CFG->{$k} = $v unless exists $CFG->{$k};
197	logout => sub { stop_game };	415	}
198		416
199	main Gtk2;	417	sdl_init;
		418
		419	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		420	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		421
		422	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		423
		424	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		425
		426	init_screen;
		427
		428	{
		429	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		430
		431	CFClient::add_font $_ for @fonts;
		432	CFClient::set_font $fonts[0];
		433	}
		434
		435	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
		436
		437	Event::loop;
		438
		439	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		440

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.16 by elmex, Fri Apr 7 17:37:11 2006 UTC vs. Revision 1.91 by root, Wed Apr 12 23:15:39 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.16 by elmex, Fri Apr 7 17:37:11 2006 UTC vs.
Revision 1.91 by root, Wed Apr 12 23:15:39 2006 UTC