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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.32 by elmex, Sat Apr 8 17:21:01 2006 UTC vs.
Revision 1.90 by root, Wed Apr 12 21:35:11 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 $UIFONT;	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;	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	$UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $HEIGHT / 40
68	or die "TTFOpenFont: $!";
69
70	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Alt-Enter toggles fullscreen mode";
71	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
72	$ALT_ENTER_MESSAGE->activate;
73
74	$tw = new Crossfire::Client::Widget::Window;
75	$tw->add (my $lbl = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!");
76	# $tw = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!";
77
78	$tw->move (0, $HEIGHT - 50);
79	$tw->activate;
80
81	glClearColor 0, 0, 0, 0;
82
83	glEnable GL_TEXTURE_2D;
84	glShadeModel GL_FLAT;
85	glDisable GL_DEPTH_TEST;
86	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
87
88	glMatrixMode GL_PROJECTION;
89	glLoadIdentity;
90	glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
91
92	glMatrixMode GL_MODELVIEW;
93
94	$_->() for @GL_INIT;
95	}	61	}
96		62
97	sub start_game {	63	sub start_game {
98	$SDL_TIMER = add Glib::Timeout 1000/100, sub {	64	status "logging in...";
99	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
100	while $SDL_EV->poll;
101		65
102	1	66	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
103	};
104
105	$WIDTH = $CFG->{width};
106	$HEIGHT = $CFG->{height};
107	$FULLSCREEN = 0;
108
109	init_screen;
110		67
111	$CONN = new conn	68	$CONN = new conn
112	host => $CFG->{host},	69	host => $CFG->{host},
113	port => $CFG->{port},	70	port => $CFG->{port},
114	user => $CFG->{user},	71	user => $CFG->{user},
115	pass => $CFG->{password};	72	pass => $CFG->{password},
		73	mapw => $mapsize,
		74	maph => $mapsize,
		75	;
		76
		77	status "login successful";
		78
		79	CFClient::lowdelay fileno $CONN->{fh};
116	}	80	}
117		81
118	sub stop_game {	82	sub stop_game {
119	remove Glib::Source $SDL_TIMER;	83	undef $CONN;
		84	}
120		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, 2, new CFClient::UI::Label align => 1, text => "Fog of War");
		119	$table->add (1, 2, 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 (1, 4, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		125	destroy_screen ();
		126	init_screen ();
		127	});
		128
		129	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
		130	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		131	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
		132	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
		133
		134	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
		135	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
		136
		137	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		138	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
		139
		140	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		141	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		142
		143	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
		144	$table->add (1, 6, new CFClient::UI::Slider
		145	req_w => 100,
		146	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		147	connect_changed => sub {
		148	my ($self, $value) = @_;
		149
		150	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		151	},
		152	);
		153
		154	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		155	start_game;
		156	});
		157
		158	$vbox->add (my $hbox = new CFClient::UI::HBox);
		159
		160	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		161	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		162	status "Configuration Saved";
		163	});
		164	$CFClient::UI::TOPLEVEL->add ($dialog);
		165	}
		166
		167	sub sdl_init {
		168	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		169	and die "SDL::Init failed!\n";
		170	}
		171
		172	sub init_screen {
		173	sdl_init;
		174
		175	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		176	$FULLSCREEN = $CFG->{fullscreen};
		177	$FAST = $CFG->{fast};
		178
		179	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
		180	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
		181	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
		182	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
		183
		184	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
		185	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
		186	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		187	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
		188
		189	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		190	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		191	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		192
		193	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		194	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		195	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		196	or die "SDL::SetVideoMode failed!\n";
		197
		198	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
		199
		200	$SDL_EV = new SDL::Event;
		201	$SDL_EV->set_unicode (1);
		202
		203	$SDL_ACTIVE = 1;
		204
		205	$LAST_REFRESH = time - 0.01;
		206
		207	CFClient::gl_init;
		208
		209	$FONTSIZE = int $HEIGHT / 40;
		210
		211	#############################################################################
		212
		213	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
		214	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
		215
		216	$STATUS_LINE = new CFClient::UI::Label
		217	padding => 0,
		218	y => $HEIGHT * 49 / 50 - $FONTSIZE;
		219	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
		220
		221	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		222	padding => 0,
		223	y => $HEIGHT * 49 / 50,
		224	height => $HEIGHT / 50,
		225	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		226	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		227
		228	$MAPWIDGET = new CFClient::UI::MapWidget;
		229	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
		230	$MAPWIDGET->focus_in;
		231
		232	config_dialog;
		233	}
		234
		235	sub destroy_screen {
		236	$CFClient::UI::TOPLEVEL->{children} = [];
		237	undef $SDL_ACTIVE;
121	undef $SDL_APP;	238	undef $SDL_EV;
122	SDL::Quit;	239	SDL::Quit;
123	}	240	}
124		241
		242	my %animate_object;
		243	my $animate_timer;
		244
		245	my $want_refresh;
		246	my $can_refresh;
		247
		248	my $fps = 9;
125		249
126	sub force_refresh {	250	sub force_refresh {
		251	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		252	debug sprintf "%3.2f", $fps;
		253
		254	$want_refresh = 0;
		255	$can_refresh = 0;
		256
127	glViewport 0, 0, $WIDTH, $HEIGHT;	257	glViewport 0, 0, $WIDTH, $HEIGHT;
		258
		259	glMatrixMode GL_PROJECTION;
		260	glLoadIdentity;
		261	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
		262	glMatrixMode GL_MODELVIEW;
		263	glLoadIdentity;
		264
		265	glClearColor +($CFG->{fow_intensity}) x 3, 1;
128	glClear GL_COLOR_BUFFER_BIT;	266	glClear GL_COLOR_BUFFER_BIT;
129		267
130	$_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;	268	$CFClient::UI::TOPLEVEL->draw;
131		269
132	SDL::GLSwapBuffers;	270	SDL::GLSwapBuffers;
133	}
134		271
135	my $refresh_handler;	272	$LAST_REFRESH = $NOW;
		273	}
		274
		275	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		276	$NOW = time;
		277
		278	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		279	while $SDL_EV->poll;
		280
		281	if (%animate_object) {
		282	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		283	$want_refresh++;
		284	}
		285
		286	if ($want_refresh) {
		287	force_refresh;
		288	} else {
		289	$can_refresh = 1;
		290	}
		291	});
136		292
137	sub refresh {	293	sub refresh {
138	$refresh_handler \|\|= add Glib::Idle sub {	294	$want_refresh++;
139	force_refresh;	295	}
140	undef $refresh_handler;	296
141	0	297	sub animation_start {
142	};	298	my ($widget) = @_;
		299	$animate_object{$widget} = $widget;
		300	}
		301
		302	sub animation_stop {
		303	my ($widget) = @_;
		304	delete $animate_object{$widget};
		305	}
		306
		307	@conn::ISA = Crossfire::Protocol::;
		308
		309	sub conn::user_send {
		310	my ($self, $command) = @_;
		311
		312	$self->send ($command);
		313	status $command;
		314	}
		315
		316	sub conn::map_update {
		317	my ($self, $dirty) = @_;
		318
		319	$MAPWIDGET->update;
		320	}
		321
		322	sub conn::map_scroll {
		323	my ($self, $dx, $dy) = @_;
		324
		325	# refresh;
		326	}
		327
		328	sub conn::map_clear {
		329	my ($self) = @_;
		330
		331	# refresh;
		332	}
		333
		334	sub conn::face_find {
		335	my ($self, $face) = @_;
		336
		337	$FACECACHE->{"$face->{chksum},$face->{name}"}
		338	}
		339
		340	sub conn::face_update {
		341	my ($self, $face) = @_;
		342
		343	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		344
		345	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		346	}
		347
		348	sub conn::query {
		349	my ($self, $flags, $prompt) = @_;
		350
		351	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
143	}	352	}
144		353
145	%SDL_CB = (	354	%SDL_CB = (
146	SDL_QUIT() => sub {	355	SDL_QUIT() => sub {
147	main_quit Gtk2;	356	Event::unloop -1;
148	},	357	},
149	SDL_VIDEORESIZE() => sub {	358	SDL_VIDEORESIZE() => sub {
150	},	359	},
151	SDL_VIDEOEXPOSE() => sub {	360	SDL_VIDEOEXPOSE() => sub {
152	refresh;	361	refresh;
153	},	362	},
154	SDL_KEYDOWN() => sub {	363	SDL_KEYDOWN() => sub {
155	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	364	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
156	# alt-enter	365	# alt-enter
157	$FULLSCREEN = !$FULLSCREEN;	366	$FULLSCREEN = !$FULLSCREEN;
		367	destroy_screen;
158	init_screen;	368	init_screen;
159	} else {	369	} else {
160	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);	370	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
161	}	371	}
162	},	372	},
163	SDL_KEYUP() => sub {	373	SDL_KEYUP() => sub {
164	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);	374	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
165	},	375	},
166	SDL_MOUSEMOTION() => sub {	376	SDL_MOUSEMOTION() => sub {
167	warn "sdl motion\n";#d#	377	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
168	},	378	},
169	SDL_MOUSEBUTTONDOWN() => sub {	379	SDL_MOUSEBUTTONDOWN() => sub {
170	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);	380	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
171	},	381	},
172	SDL_MOUSEBUTTONUP() => sub {	382	SDL_MOUSEBUTTONUP() => sub {
173	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);	383	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
174	},	384	},
175	SDL_ACTIVEEVENT() => sub {	385	SDL_ACTIVEEVENT() => sub {
176	warn "active\n";#d#	386	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
177	},	387	},
178	);	388	);
179		389
180	@conn::ISA = Crossfire::Protocol::;
181
182	sub conn::map_update {
183	my ($self, $dirty) = @_;
184
185	refresh;
186	}
187
188	sub conn::map_scroll {
189	my ($self, $dx, $dy) = @_;
190
191	refresh;
192	}
193
194	sub conn::map_clear {
195	my ($self) = @_;
196
197	refresh;
198	}
199
200	sub conn::face_find {
201	my ($self, $face) = @_;
202
203	$FACECACHE->{"$face->{chksum},$face->{name}"}
204	}
205
206	sub conn::face_update {
207	my ($self, $face) = @_;
208
209	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
210
211	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
212	}
213
214	sub gtk_add_cfg_field {
215	my ($tbl, $cfg, $klbl, $key, $value) = @_;
216	my $i = $cfg->{_i}++;
217	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
218	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
219	if ($key eq 'password') {
220	$ent->set_invisible_char ("*");
221	$ent->set (visibility => 0)
222	}
223	$ent->set_text ($value);
224	$ent->signal_connect (changed => sub {
225	my ($ent) = @_;
226	$cfg->{$key} = $ent->get_text;
227	});
228	}
229
230	sub run_config_dialog {
231	my (%events) = @_;
232
233	my $w = Gtk2::Window->new;
234
235	my @cfg = (
236	[qw/Host host/],
237	[qw/Port port/],
238	[qw/Username user/],
239	[qw/Password password/],
240	);
241
242	my $cfg = {};
243
244	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
245	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
246
247	$w->add (my $vb = Gtk2::VBox->new);
248	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
249	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
250	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
251	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
252	my $i = 0;
253	my $act = 0;
254	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
255	if ($_ eq $selmode) { $act = $i }
256	$cb->append_text ($_);
257	$i++;
258	}
259	$cb->set_active ($act);
260	$cb->signal_connect (changed => sub {
261	my ($cb) = @_;
262	my $txt = $cb->get_active_text;
263	if ($txt =~ m/(\d+)x(\d+)/) {
264	$::CFG->{width} = $1;
265	$::CFG->{height} = $2;
266	}
267	});
268
269	$cfg->{_i} = 1;
270	for (@cfg) {
271	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
272	}
273
274	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
275	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
276	$cb->signal_connect (clicked => sub {
277	for (keys %$cfg) {
278	$::CFG->{$_} = $cfg->{$_}
279	if $_ ne '_i';
280	}
281	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
282	});
283	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
284	$cb->signal_connect (clicked => sub {
285	for (keys %$cfg) {
286	$::CFG->{$_} = $cfg->{$_}
287	if $_ ne '_i';
288	}
289	my $cb = $events{login} \|\| sub {};
290	$cb->($::CFG->{user}, $::CFG->{password});
291	});
292	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
293	$cb->signal_connect (clicked => sub {
294	my $cb = $events{login} \|\| sub {};
295	$cb->();
296	});
297	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
298	$cb->signal_connect (clicked => sub { $w->destroy });
299
300	$w->show_all;
301
302	$w->signal_connect (destroy => sub { Gtk2->main_quit });
303	}
304
305
306	#############################################################################	390	#############################################################################
307		391
308	SDL::Init SDL_INIT_EVERYTHING;
309	SDL::TTFInit;
310
311	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
312
313	$mapwidget->activate;
314	$mapwidget->focus_in;
315
316	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";	392	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
317		393
318	$CFG \|\|= {	394	my %DEF_CFG = (
319	width => 640,	395	width => 640,
320	height => 480,	396	height => 480,
		397	fast => 0,
		398	fow_intensity => 0.45,
321	fullscreen => 0,	399	fullscreen => 0,
		400	sdl_mode => 0,
		401	mapsize => 100,
322	host => "crossfire.schmorp.de",	402	host => "crossfire.schmorp.de",
323	port => 13327,	403	port => 13327,
324	};	404	);
		405
		406	while (my ($k, $v) = each %DEF_CFG) {
		407	$CFG->{$k} = $v unless exists $CFG->{$k};
		408	}
		409
		410	sdl_init;
		411
		412	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		413	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		414
		415	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		416
		417	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		418
		419	init_screen;
		420
		421	{
		422	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		423
		424	CFClient::add_font $_ for @fonts;
		425	CFClient::set_font $fonts[0];
		426	}
325		427
326	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	428	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
327		429
328	run_config_dialog	430	Event::loop;
329	login => sub { start_game },
330	logout => sub { stop_game };
331
332	main Gtk2;
333		431
334	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	432	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		433

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.32 by elmex, Sat Apr 8 17:21:01 2006 UTC vs. Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.32 by elmex, Sat Apr 8 17:21:01 2006 UTC vs.
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC