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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.39 by root, Sun Apr 9 00:09:50 2006 UTC vs.
Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Glib;	6	use Time::HiRes 'time';
7	use Gtk2 -init;	7	use Event;
8		8
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::Client;
18	use Crossfire::Protocol;	16	use Crossfire::Protocol;
19		17
20	use Crossfire::Client::Widget;	18	use CFClient;
		19	use CFClient::UI;
		20
		21	our $VERSION = '0.1';
		22
		23	my $MAX_FPS = 60;
		24	my $MIN_FPS = 5; # unused as of yet
21		25
22	our $FACECACHE;	26	our $FACECACHE;
23		27
24	our $VERSION = '0.1';	28	our $LAST_REFRESH;
25		29	our $NOW;
26	our %GL_EXT;
27		30
28	our $CFG;	31	our $CFG;
29	our $CONN;	32	our $CONN;
		33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
30		34
		35	our @SDL_MODES;
31	our $WIDTH;	36	our $WIDTH;
32	our $HEIGHT;	37	our $HEIGHT;
33	our $FULLSCREEN;	38	our $FULLSCREEN;
34		39
		40	our $MAPWIDGET;
35	our $FONTSIZE;	41	our $FONTSIZE;
36		42
37	our $SDL_TIMER;	43	our $SDL_ACTIVE;
38	our $SDL_APP;	44	our $SDL_EV;
39	our $SDL_EV = new SDL::Event;
40	our %SDL_CB;	45	our %SDL_CB;
41		46
42	our @GL_INIT; # hooks called on every gl init
43
44	our $ALT_ENTER_MESSAGE;	47	our $ALT_ENTER_MESSAGE;
		48	our $STATUS_LINE;
		49	our $DEBUG_STATUS;
45		50
46	our $tw; # Test widget #d#	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	}
47		56
48	sub init_screen {	57	sub debug {
49	$SDL_APP = new SDL::App	58	$DEBUG_STATUS->set_text ($_[0]);
50	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	59	my ($w, $h) = $DEBUG_STATUS->size_request;
51	-title => "Crossfire+ Client",	60	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
52	-width => $WIDTH,
53	-height => $HEIGHT,
54	-opengl => 1,
55	-red_size => 8,
56	-green_size => 8,
57	-blue_size => 8,
58	-double_buffer => 1,
59	-fullscreen => $FULLSCREEN,
60	-resizeable => 0;
61
62	%GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
63
64	$GL_EXT{GL_ARB_texture_non_power_of_two}
65	or warn "WARNING: non-power-of-two opengl extension required";
66
67	$FONTSIZE = int $HEIGHT / 40;
68
69	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE, "Alt-Enter toggles fullscreen mode";
70	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
71	$ALT_ENTER_MESSAGE->activate;
72
73	# Test code #d#
74	{
75	my $frm = new Crossfire::Client::Widget::Frame;
76	$tw = new Crossfire::Client::Widget::Window;
77	$frm->add (new Crossfire::Client::Widget::Label 0, 0, 10, $FONTSIZE, "Foo in the garden!");
78	$tw->add ($frm);
79
80	$tw->move (0, $HEIGHT - 120);
81	$tw->activate;
82	}
83
84	glClearColor 0, 0, 0, 0;
85
86	glEnable GL_TEXTURE_2D;
87	glEnable GL_COLOR_MATERIAL;
88	glShadeModel GL_FLAT;
89	glDisable GL_DEPTH_TEST;
90	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
91
92	$_->() for @GL_INIT;
93	}	61	}
94		62
95	sub start_game {	63	sub start_game {
96	$SDL_TIMER = add Glib::Timeout 1000/100, sub {	64	status "logging in...";
97	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
98	while $SDL_EV->poll;
99		65
100	1	66	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
101	};
102
103	$WIDTH = $CFG->{width};
104	$HEIGHT = $CFG->{height};
105	$FULLSCREEN = 0;
106
107	init_screen;
108		67
109	$CONN = new conn	68	$CONN = new conn
110	host => $CFG->{host},	69	host => $CFG->{host},
111	port => $CFG->{port},	70	port => $CFG->{port},
112	user => $CFG->{user},	71	user => $CFG->{user},
113	pass => $CFG->{password},	72	pass => $CFG->{password},
114	mapw => 50,	73	mapw => $mapsize,
115	maph => 37,	74	maph => $mapsize,
116	;	75	;
		76
		77	status "login successful";
		78
		79	CFClient::lowdelay fileno $CONN->{fh};
117	}	80	}
118		81
119	sub stop_game {	82	sub stop_game {
120	remove Glib::Source $SDL_TIMER;	83	undef $CONN;
		84	}
121		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
		178	sub init_screen {
		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);
		221
		222	$STATUS_LINE = new CFClient::UI::Label
		223	padding => 0,
		224	y => $HEIGHT * 49 / 50 - $FONTSIZE;
		225	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
		226
		227	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		228	padding => 0,
		229	y => $HEIGHT * 49 / 50,
		230	height => $HEIGHT / 50,
		231	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		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;
122	undef $SDL_APP;	244	undef $SDL_EV;
123	SDL::Quit;	245	SDL::Quit;
124	}	246	}
125		247
		248	my %animate_object;
		249	my $animate_timer;
		250
		251	my $want_refresh;
		252	my $can_refresh;
		253
		254	my $fps = 9;
126		255
127	sub force_refresh {	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
128	glViewport 0, 0, $WIDTH, $HEIGHT;	263	glViewport 0, 0, $WIDTH, $HEIGHT;
129		264
130	glMatrixMode GL_PROJECTION;	265	glMatrixMode GL_PROJECTION;
131	glLoadIdentity;	266	glLoadIdentity;
132	glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;	267	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
133	glMatrixMode GL_MODELVIEW;	268	glMatrixMode GL_MODELVIEW;
		269	glLoadIdentity;
134		270
		271	glClearColor +($CFG->{fow_intensity}) x 3, 1;
135	glClear GL_COLOR_BUFFER_BIT;	272	glClear GL_COLOR_BUFFER_BIT;
136		273
137	$_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;	274	$CFClient::UI::TOPLEVEL->draw;
138		275
139	SDL::GLSwapBuffers;	276	SDL::GLSwapBuffers;
140	}
141		277
142	my $refresh_handler;	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
		284	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		285	while $SDL_EV->poll;
		286
		287	if (%animate_object) {
		288	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		289	$want_refresh++;
		290	}
		291
		292	if ($want_refresh) {
		293	force_refresh;
		294	} else {
		295	$can_refresh = 1;
		296	}
		297	});
143		298
144	sub refresh {	299	sub refresh {
145	$refresh_handler \|\|= add Glib::Idle sub {	300	$want_refresh++;
146	force_refresh;	301	}
147	undef $refresh_handler;	302
148	0	303	sub animation_start {
149	};	304	my ($widget) = @_;
		305	$animate_object{$widget} = $widget;
		306	}
		307
		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#
150	}	358	}
151		359
152	%SDL_CB = (	360	%SDL_CB = (
153	SDL_QUIT() => sub {	361	SDL_QUIT() => sub {
154	main_quit Gtk2;	362	Event::unloop -1;
155	},	363	},
156	SDL_VIDEORESIZE() => sub {	364	SDL_VIDEORESIZE() => sub {
157	},	365	},
158	SDL_VIDEOEXPOSE() => sub {	366	SDL_VIDEOEXPOSE() => sub {
159	refresh;	367	refresh;
160	},	368	},
161	SDL_KEYDOWN() => sub {	369	SDL_KEYDOWN() => sub {
162	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	370	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
163	# alt-enter	371	# alt-enter
164	$FULLSCREEN = !$FULLSCREEN;	372	$FULLSCREEN = !$FULLSCREEN;
		373	destroy_screen;
165	init_screen;	374	init_screen;
166	} else {	375	} else {
167	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);	376	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
168	}	377	}
169	},	378	},
170	SDL_KEYUP() => sub {	379	SDL_KEYUP() => sub {
171	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);	380	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
172	},	381	},
173	SDL_MOUSEMOTION() => sub {	382	SDL_MOUSEMOTION() => sub {
174	warn "sdl motion\n";#d#	383	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
175	},	384	},
176	SDL_MOUSEBUTTONDOWN() => sub {	385	SDL_MOUSEBUTTONDOWN() => sub {
177	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);	386	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
178	},	387	},
179	SDL_MOUSEBUTTONUP() => sub {	388	SDL_MOUSEBUTTONUP() => sub {
180	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);	389	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
181	},	390	},
182	SDL_ACTIVEEVENT() => sub {	391	SDL_ACTIVEEVENT() => sub {
183	warn "active\n";#d#	392	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
184	},	393	},
185	);	394	);
186		395
187	@conn::ISA = Crossfire::Protocol::;
188
189	sub conn::map_update {
190	my ($self, $dirty) = @_;
191
192	refresh;
193	}
194
195	sub conn::map_scroll {
196	my ($self, $dx, $dy) = @_;
197
198	refresh;
199	}
200
201	sub conn::map_clear {
202	my ($self) = @_;
203
204	refresh;
205	}
206
207	sub conn::face_find {
208	my ($self, $face) = @_;
209
210	$FACECACHE->{"$face->{chksum},$face->{name}"}
211	}
212
213	sub conn::face_update {
214	my ($self, $face) = @_;
215
216	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
217
218	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
219	}
220
221	sub conn::query {
222	my ($self, $flags, $prompt) = @_;
223
224	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
225	}
226
227	sub gtk_add_cfg_field {
228	my ($tbl, $cfg, $klbl, $key, $value) = @_;
229	my $i = $cfg->{_i}++;
230	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
231	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
232	if ($key eq 'password') {
233	$ent->set_invisible_char ("*");
234	$ent->set (visibility => 0)
235	}
236	$ent->set_text ($value);
237	$ent->signal_connect (changed => sub {
238	my ($ent) = @_;
239	$cfg->{$key} = $ent->get_text;
240	});
241	}
242
243	sub run_config_dialog {
244	my (%events) = @_;
245
246	my $w = Gtk2::Window->new;
247
248	my @cfg = (
249	[qw/Host host/],
250	[qw/Port port/],
251	[qw/Username user/],
252	[qw/Password password/],
253	);
254
255	my $cfg = {};
256
257	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
258	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
259
260	$w->add (my $vb = Gtk2::VBox->new);
261	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
262	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
263	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
264	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
265	my $i = 0;
266	my $act = 0;
267	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
268	if ($_ eq $selmode) { $act = $i }
269	$cb->append_text ($_);
270	$i++;
271	}
272	$cb->set_active ($act);
273	$cb->signal_connect (changed => sub {
274	my ($cb) = @_;
275	my $txt = $cb->get_active_text;
276	if ($txt =~ m/(\d+)x(\d+)/) {
277	$::CFG->{width} = $1;
278	$::CFG->{height} = $2;
279	}
280	});
281
282	$cfg->{_i} = 1;
283	for (@cfg) {
284	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
285	}
286
287	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
288	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
289	$cb->signal_connect (clicked => sub {
290	for (keys %$cfg) {
291	$::CFG->{$_} = $cfg->{$_}
292	if $_ ne '_i';
293	}
294	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
295	});
296	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
297	$cb->signal_connect (clicked => sub {
298	for (keys %$cfg) {
299	$::CFG->{$_} = $cfg->{$_}
300	if $_ ne '_i';
301	}
302	my $cb = $events{login} \|\| sub {};
303	$cb->($::CFG->{user}, $::CFG->{password});
304	});
305	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
306	$cb->signal_connect (clicked => sub {
307	my $cb = $events{login} \|\| sub {};
308	$cb->();
309	});
310	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
311	$cb->signal_connect (clicked => sub { $w->destroy });
312
313	$w->show_all;
314
315	$w->signal_connect (destroy => sub { Gtk2->main_quit });
316	}
317
318
319	#############################################################################	396	#############################################################################
320		397
321	SDL::Init SDL_INIT_EVERYTHING;
322
323	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
324
325	$mapwidget->activate;
326	$mapwidget->focus_in;
327
328	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";	398	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
329		399
330	$CFG \|\|= {	400	my %DEF_CFG = (
331	width => 640,	401	width => 640,
332	height => 480,	402	height => 480,
		403	fast => 0,
		404	fow_intensity => 0.45,
		405	fow_smooth => 0,
333	fullscreen => 0,	406	fullscreen => 0,
		407	sdl_mode => 0,
		408	mapsize => 100,
334	host => "crossfire.schmorp.de",	409	host => "crossfire.schmorp.de",
335	port => 13327,	410	port => 13327,
336	};	411	);
		412
		413	while (my ($k, $v) = each %DEF_CFG) {
		414	$CFG->{$k} = $v unless exists $CFG->{$k};
		415	}
		416
		417	sdl_init;
		418
		419	@SDL_MODES = reverse
		420	grep $_->[0] >= 640 && $_->[1] >= 480,
		421	map [SDL::RectW ($_), SDL::RectH ($_)],
		422	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		423
		424	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		425
		426	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		427
		428	init_screen;
		429
		430	{
		431	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		432
		433	CFClient::add_font $_ for @fonts;
		434	CFClient::set_font $fonts[0];
		435	}
337		436
338	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	437	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
339		438
340	run_config_dialog	439	Event::loop;
341	login => sub { start_game },
342	logout => sub { stop_game };
343
344	main Gtk2;
345		440
346	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	441	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		442

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.39 by root, Sun Apr 9 00:09:50 2006 UTC vs. Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.39 by root, Sun Apr 9 00:09:50 2006 UTC vs.
Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC