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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.81 by root, Wed Apr 12 02:05:46 2006 UTC vs.
Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC

…		…
9	use SDL;	9	use SDL;
10	use SDL::App;	10	use SDL::App;
11	use SDL::Event;	11	use SDL::Event;
12	use SDL::Surface;	12	use SDL::Surface;
13	use SDL::OpenGL;	13	use SDL::OpenGL;
14	use SDL::OpenGL::Constants;
15		14
16	use Crossfire;	15	use Crossfire;
17	use Crossfire::Protocol;	16	use Crossfire::Protocol;
18		17
19	use CFClient;	18	use CFClient;
20	use CFClient::UI;	19	use CFClient::UI;
21		20
22	our $VERSION = '0.1';	21	our $VERSION = '0.1';
23		22
24	my $MAX_FPS = 60;	23	my $MAX_FPS = 60;
		24	my $MIN_FPS = 5; # unused
25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame	25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26		26
27	our $FACECACHE;	27	our $FACECACHE;
28		28
29	our $CFG;	29	our $CFG;
30	our $CONN;	30	our $CONN;
31	our $FAST; # fast, low-quality mode	31	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
32		32
33	our @SDL_MODES;	33	our @SDL_MODES;
34	our $WIDTH;	34	our $WIDTH;
35	our $HEIGHT;	35	our $HEIGHT;
36	our $FULLSCREEN;	36	our $FULLSCREEN;
…		…
39		39
40	our $MAPWIDGET;	40	our $MAPWIDGET;
41	our $FONTSIZE;	41	our $FONTSIZE;
42		42
43	our $SDL_TIMER;	43	our $SDL_TIMER;
44	our $SDL_APP;	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;
…		…
51		51
52	my $last_refresh;	52	my $last_refresh;
53	my %ANIMATE;	53	my %ANIMATE;
54	my $refresh_handler;	54	my $refresh_handler;
55		55
56	sub config_dialog {	56	sub status {
57	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	57	$STATUS_LINE->set_text ($_[0]);
58	child => (my $vbox = new CFClient::UI::VBox);	58	my ($w, $h) = $STATUS_LINE->size_request;
59	$vbox->add (new CFClient::UI::Label align => 0, text => "Setup");	59	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
60	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
61
62	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
63	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
64
65	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
66	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
67
68	$mode_slider->connect (changed => sub {
69	my ($self, $value) = @_;
70
71	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
72	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
73	});
74	$mode_slider->emit (changed => $mode_slider->{range}[0]);
75
76	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
77	$table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
78
79	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
80	$table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
81
82	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
83	$table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
84
85	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
86	$table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
87
88	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
89	$table->add (1, 5, new CFClient::UI::Slider
90	req_w => 100,
91	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
92	connect_changed => sub {
93	my ($self, $value) = @_;
94
95	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
96	},
97	);
98
99	$vbox->add (my $hbox = new CFClient::UI::HBox);
100	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
101	warn "save\n";
102	});
103	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
104	warn "login\n";
105	});
106	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
107	warn "apply\n";
108	});
109
110	$CFClient::UI::TOPLEVEL->add ($dialog);
111	}	60	}
112		61
113	sub init_screen {	62	sub debug {
114	$SDL_APP = new SDL::App	63	$DEBUG_STATUS->set_text ($_[0]);
115	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	64	my ($w, $h) = $DEBUG_STATUS->size_request;
116	-title => "Crossfire+ Client",	65	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
117	-width => $WIDTH,
118	-height => $HEIGHT,
119	-opengl => 1,
120	-red_size => 5,
121	-green_size => 5,
122	-blue_size => 5,
123	-alpha_size => 0,
124	-double_buffer => 1,
125	-fullscreen => $FULLSCREEN,
126	-resizeable => 0;
127
128	$SDL_EV = new SDL::Event;
129	$SDL_EV->set_unicode (1);
130
131	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
132	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
133	while $SDL_EV->poll;
134
135	1
136	};
137
138	$last_refresh = SDL::GetTicks;
139
140	CFClient::gl_init;
141
142	$FONTSIZE = int $HEIGHT / 40;
143
144	#############################################################################
145
146	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
147	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
148
149	$STATUS_LINE = new CFClient::UI::Label
150	padding => 0,
151	y => $HEIGHT * 49 / 50 - $FONTSIZE;
152	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
153
154	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
155	padding => 0,
156	y => $HEIGHT * 49 / 50,
157	height => $HEIGHT / 50,
158	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
159	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
160
161	$MAPWIDGET = new CFClient::UI::MapWidget;
162	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
163	$MAPWIDGET->focus_in;
164
165	config_dialog;
166	}
167
168	sub destroy_screen {
169	$CFClient::UI::TOPLEVEL->{children} = [];
170	remove Glib::Source $SDL_TIMER;
171	undef $SDL_APP;
172	undef $SDL_EV;
173	SDL::Quit;
174	}	66	}
175		67
176	sub start_game {	68	sub start_game {
177	$WIDTH = $CFG->{width};	69	status "logging in...";
178	$HEIGHT = $CFG->{height};
179	$FULLSCREEN = 0;
180
181	init_screen;
182		70
183	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	71	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
184		72
185	$CONN = new conn	73	$CONN = new conn
186	host => $CFG->{host},	74	host => $CFG->{host},
…		…
189	pass => $CFG->{password},	77	pass => $CFG->{password},
190	mapw => $mapsize,	78	mapw => $mapsize,
191	maph => $mapsize,	79	maph => $mapsize,
192	;	80	;
193		81
		82	status "login successful";
		83
194	CFClient::lowdelay fileno $CONN->{fh};	84	CFClient::lowdelay fileno $CONN->{fh};
195	}	85	}
196		86
197	sub stop_game {	87	sub stop_game {
		88	undef $CONN;
		89	}
		90
		91	sub config_dialog {
		92	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
		93	child => (my $vbox = new CFClient::UI::VBox);
		94	$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
		97	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		98	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		99
		100	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		101	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		102
		103	$mode_slider->connect (changed => sub {
		104	my ($self, $value) = @_;
		105
		106	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		107	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		108	});
		109	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		110
		111	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		112	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		113	my ($self, $value) = @_;
		114	$CFG->{fullscreen} = $value;
		115	});
		116
		117	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		118	destroy_screen ();
		119	init_screen ();
		120	});
		121
		122	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");
		123	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		124	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
		125	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
		126
		127	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
		128	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
		129
		130	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		131	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
		132
		133	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		134	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		135
		136	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
		137	$table->add (1, 6, new CFClient::UI::Slider
		138	req_w => 100,
		139	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		140	connect_changed => sub {
		141	my ($self, $value) = @_;
		142
		143	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		144	},
		145	);
		146
		147	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		148	start_game;
		149	});
		150
		151	$vbox->add (my $hbox = new CFClient::UI::HBox);
		152
		153	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		154	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		155	status "Configuration Saved";
		156	});
		157	$CFClient::UI::TOPLEVEL->add ($dialog);
		158	}
		159
		160	sub init_screen {
		161	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		162	$FULLSCREEN = $CFG->{fullscreen};
		163
		164	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		165	and die "SDL::Init failed!\n";
		166
		167	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
		168	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
		169	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
		170	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
		171
		172	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
		173	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
		174	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		175	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
		176
		177	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		178	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		179	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		180
		181	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		182	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		183	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		184	or die "SDL::SetVideoMode failed!\n";
		185
		186	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
		187
		188	$SDL_EV = new SDL::Event;
		189	$SDL_EV->set_unicode (1);
		190
		191	$SDL_ACTIVE = 1;
		192
		193	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
		194	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		195	while $SDL_EV->poll;
		196
		197	1
		198	};
		199
		200	$last_refresh = SDL::GetTicks;
		201
		202	CFClient::gl_init;
		203
		204	$FONTSIZE = int $HEIGHT / 40;
		205
		206	#############################################################################
		207
		208	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
		209	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
		210
		211	$STATUS_LINE = new CFClient::UI::Label
		212	padding => 0,
		213	y => $HEIGHT * 49 / 50 - $FONTSIZE;
		214	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
		215
		216	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		217	padding => 0,
		218	y => $HEIGHT * 49 / 50,
		219	height => $HEIGHT / 50,
		220	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		221	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		222
		223	$MAPWIDGET = new CFClient::UI::MapWidget;
		224	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
		225	$MAPWIDGET->focus_in;
		226
		227	config_dialog;
		228	}
		229
		230	sub destroy_screen {
		231	$CFClient::UI::TOPLEVEL->{children} = [];
		232	remove Glib::Source $SDL_TIMER;
198	remove Glib::Source $refresh_handler if $refresh_handler;	233	remove Glib::Source $refresh_handler if $refresh_handler;
199	undef $refresh_handler;	234	undef $refresh_handler;
200		235	undef $SDL_ACTIVE;
201	undef $CONN;	236	undef $SDL_EV;
202	destroy_screen;	237	SDL::Quit;
203	}	238	}
204		239
205	sub force_refresh {	240	sub force_refresh {
206	glViewport 0, 0, $WIDTH, $HEIGHT;	241	glViewport 0, 0, $WIDTH, $HEIGHT;
207		242
…		…
216	$CFClient::UI::TOPLEVEL->draw;	251	$CFClient::UI::TOPLEVEL->draw;
217		252
218	SDL::GLSwapBuffers;	253	SDL::GLSwapBuffers;
219	}	254	}
220		255
221	sub debug {
222	$DEBUG_STATUS->set_text ($_[0]);
223	my ($w, $h) = $DEBUG_STATUS->size_request;
224	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
225	}
226
227	my $FPS;	256	my $FPS;
228		257
229	sub refresh {	258	sub refresh {
230	$refresh_handler \|\|= add Glib::Idle sub {	259	$refresh_handler \|\|= add Glib::Idle sub {
231	if ($SDL_APP) {	260	if ($SDL_ACTIVE) {
232	$NOW = SDL::GetTicks;	261	$NOW = SDL::GetTicks;
233		262
234	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {	263	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
235	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);	264	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
236	$NOW = SDL::GetTicks;	265	$NOW = SDL::GetTicks;
…		…
456	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	485	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
457		486
458	$CFG \|\|= {	487	$CFG \|\|= {
459	width => 640,	488	width => 640,
460	height => 480,	489	height => 480,
		490	fullscreen => 0,
		491	sdl_mode => 0,
461	mapsize => 100,	492	mapsize => 100,
462	fullscreen => 0,
463	host => "crossfire.schmorp.de",	493	host => "crossfire.schmorp.de",
464	port => 13327,	494	port => 13327,
465	};	495	};
466		496
467	{	497	{
…		…
471	CFClient::set_font $fonts[0];	501	CFClient::set_font $fonts[0];
472	}	502	}
473		503
474	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	504	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
475		505
476	run_config_dialog	506	init_screen;
477	login => sub { start_game },
478	logout => sub { stop_game };
479		507
480	main Gtk2;	508	main Gtk2;
481		509
482	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	510	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		511

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.81 by root, Wed Apr 12 02:05:46 2006 UTC vs. Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.81 by root, Wed Apr 12 02:05:46 2006 UTC vs.
Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC