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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.24 by root, Fri Apr 7 20:34:44 2006 UTC vs.
Revision 1.99 by root, Fri Apr 14 02:03:11 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 Crossfire::Client::Util;	18	use CFClient;
19	use Crossfire::Client::Widget;	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
20		25
21	our $FACECACHE;	26	our $FACECACHE;
22		27
23	our $VERSION = '0.1';	28	our $LAST_REFRESH;
		29	our $NOW;
24		30
25	our $CFG;	31	our $CFG;
26	our $CONN;	32	our $CONN;
		33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
27		34
28	our $GUIFONT;	35	our @SDL_MODES;
		36	our $WIDTH;
		37	our $HEIGHT;
		38	our $FULLSCREEN;
		39	our $FONTSIZE;
29		40
		41	our $MAP;
		42	our $MAPWIDGET;
		43
30	our $SDL_TIMER;	44	our $SDL_ACTIVE;
31	our $SDL_APP;	45	our $SDL_EV;
32	our $SDL_EV = new SDL::Event;
33	our %SDL_CB;	46	our %SDL_CB;
34		47
35	our @GL_INIT; # hooks called on every gl init	48	our $ALT_ENTER_MESSAGE;
		49	our $STATUS_LINE;
		50	our $DEBUG_STATUS;
		51	our $BUTTONBAR;
		52	our $LOGVIEW;
		53
		54	sub status {
		55	$STATUS_LINE->set_text ($_[0]);
		56	my ($w, $h) = $STATUS_LINE->size_request;
		57	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
		58	}
		59
		60	sub debug {
		61	$DEBUG_STATUS->set_text ($_[0]);
		62	my ($w, $h) = $DEBUG_STATUS->size_request;
		63	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
		64	}
		65
		66	sub start_game {
		67	status "logging in...";
		68
		69	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		70
		71	$MAP = new CFClient::Map $mapsize, $mapsize;
		72
		73	$CONN = new conn
		74	host => $CFG->{host},
		75	port => $CFG->{port},
		76	user => $CFG->{user},
		77	pass => $CFG->{password},
		78	mapw => $mapsize,
		79	maph => $mapsize,
		80	;
		81
		82	status "login successful";
		83
		84	CFClient::lowdelay fileno $CONN->{fh};
		85	}
		86
		87	sub stop_game {
		88	undef $CONN;
		89	}
		90
		91	sub config_dialog {
		92	my $dialog = new CFClient::UI::FancyFrame
		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 (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		118	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		119	my ($self, $value) = @_;
		120	$CFG->{fast} = $value;
		121	});
		122
		123	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		124	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		125	my ($self, $value) = @_;
		126	$CFG->{fow_enable} = $value;
		127	});
		128
		129	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
		130	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		131	my ($self, $value) = @_;
		132	$CFG->{fow_intensity} = $value;
		133	});
		134
		135	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		136	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		137	my ($self, $value) = @_;
		138	$CFG->{fow_smooth} = $value;
		139	});
		140
		141	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		142	destroy_screen ();
		143	init_screen ();
		144	});
		145
		146	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
		147	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		148	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
		149	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
		150
		151	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
		152	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
		153
		154	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		155	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
		156
		157	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		158	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		159
		160	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
		161	$table->add (1, 6, new CFClient::UI::Slider
		162	req_w => 100,
		163	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		164	connect_changed => sub {
		165	my ($self, $value) = @_;
		166
		167	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		168	},
		169	);
		170
		171	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		172	start_game;
		173	});
		174
		175	$vbox->add (my $hbox = new CFClient::UI::HBox);
		176
		177	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		178	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		179	status "Configuration Saved";
		180	});
		181
		182	$dialog
		183	}
		184
		185	sub console_window {
		186	my $window = new CFClient::UI::FancyFrame
		187	border_bg => [1, 1, 1, 0.5],
		188	bg => [0.3, 0.3, 0.3, 0.8],
		189	child => (my $vbox = new CFClient::UI::VBox);
		190
		191	$vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);
		192	$vbox->add (my $input = new CFClient::UI::Entry);
		193
		194	$window
		195	}
		196
		197	sub sdl_init {
		198	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		199	and die "SDL::Init failed!\n";
		200	}
36		201
37	sub init_screen {	202	sub init_screen {
38	$SDL_APP = new SDL::App	203	sdl_init;
39	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
40	-title => "Crossfire+ Client",
41	-width => $CFG->{width},
42	-height => $CFG->{height},
43	-opengl => 1,
44	-red_size => 8,
45	-green_size => 8,
46	-blue_size => 8,
47	-double_buffer => 1,
48	-fullscreen => $CFG->{fullscreen},
49	-resizeable => 0;
50		204
51	glClearColor 0, 0, 0, 0;	205	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		206	$FULLSCREEN = $CFG->{fullscreen};
		207	$FAST = $CFG->{fast};
52		208
53	glEnable GL_TEXTURE_2D;	209	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
54	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	210	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
55	glShadeModel GL_FLAT;	211	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
56	glDisable GL_DEPTH_TEST;	212	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
57	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	213
58	glEnable GL_BLEND;	214	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
		215	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
		216	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		217	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
		218
		219	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		220	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		221	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		222
		223	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		224	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		225	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		226	or die "SDL::SetVideoMode failed!\n";
		227
		228	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
		229
		230	$SDL_EV = new SDL::Event;
		231	$SDL_EV->set_unicode (1);
		232
		233	$SDL_ACTIVE = 1;
		234
		235	$LAST_REFRESH = time - 0.01;
		236
		237	CFClient::gl_init;
		238
		239	$FONTSIZE = int $HEIGHT / 40;
		240
		241	#############################################################################
		242
		243	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
		244	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
		245
		246	$STATUS_LINE = new CFClient::UI::Label
		247	padding => 0,
		248	y => $HEIGHT * 44 / 45 - $FONTSIZE;
		249	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
		250
		251	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		252	padding => 0,
		253	y => $HEIGHT * 44 / 45,
		254	height => $HEIGHT / 45,
		255	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		256	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		257
		258	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
		259	$MAPWIDGET->focus_in;
		260
		261	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
		262
		263	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
		264	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
		265	}
		266
		267	sub destroy_screen {
		268	$CFClient::UI::TOPLEVEL->{children} = [];
		269	undef $SDL_ACTIVE;
		270	undef $SDL_EV;
		271	SDL::Quit;
		272	}
		273
		274	my %animate_object;
		275	my $animate_timer;
		276
		277	my $want_refresh;
		278	my $can_refresh;
		279
		280	my $fps = 9;
		281
		282	sub force_refresh {
		283	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		284	debug sprintf "%3.2f", $fps;
		285
		286	$want_refresh = 0;
		287	$can_refresh = 0;
		288
		289	glViewport 0, 0, $WIDTH, $HEIGHT;
59		290
60	glMatrixMode GL_PROJECTION;	291	glMatrixMode GL_PROJECTION;
61	glLoadIdentity;	292	glLoadIdentity;
62	glOrtho 0, $CFG->{width}, $CFG->{height}, 0, -100 , 100;	293	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
63
64	glMatrixMode GL_MODELVIEW;	294	glMatrixMode GL_MODELVIEW;
		295	glLoadIdentity;
65		296
66	$_->() for @GL_INIT;	297	glClearColor +($CFG->{fow_intensity}) x 3, 1;
67	}	298	glClear GL_COLOR_BUFFER_BIT;
68		299
69	my $label;#d#	300	$CFClient::UI::TOPLEVEL->draw;
70		301
71	sub start_game {	302	SDL::GLSwapBuffers;
72	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	303
73	while ($SDL_EV->poll) {	304	$LAST_REFRESH = $NOW;
		305	}
		306
		307	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		308	$NOW = time;
		309
74	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	310	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
75	}	311	while $SDL_EV->poll;
76		312
77	1	313	if (%animate_object) {
		314	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		315	$want_refresh++;
78	};	316	}
79		317
80	init_screen;	318	if ($want_refresh) {
81		319	force_refresh;
82	# $label = new Crossfire::Client::Widget::Label "Testü[]";	320	} else {
83	# $label->activate;	321	$can_refresh = 1;
84		322	}
85	$CONN = new conn	323	});
86	host => $CFG->{host},
87	port => $CFG->{port};
88	}
89
90	sub stop_game {
91	remove Glib::Source $SDL_TIMER;
92
93	undef $SDL_APP;
94	SDL::Quit;
95	}
96		324
97	sub refresh {	325	sub refresh {
98	glClear GL_COLOR_BUFFER_BIT;	326	$want_refresh++;
		327	}
99		328
100	$_->draw for values %Crossfire::Client::Widget::ACTIVE_WIDGETS;	329	sub animation_start {
		330	my ($widget) = @_;
		331	$animate_object{$widget} = $widget;
		332	}
101		333
102	SDL::GLSwapBuffers;	334	sub animation_stop {
		335	my ($widget) = @_;
		336	delete $animate_object{$widget};
		337	}
		338
		339	@conn::ISA = Crossfire::Protocol::;
		340
		341	sub conn::user_send {
		342	my ($self, $command) = @_;
		343
		344	$self->send ($command);
		345	status $command;
		346	}
		347
		348	sub conn::feed_map1a {
		349	my ($self, $data) = @_;
		350
		351	# $self->Crossfire::Protocol::feed_map1a ($data);
		352
		353	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		354	$MAP->map1a_update ($data);
		355	$MAPWIDGET->update;
		356	}
		357
		358	#sub conn::map_update {
		359	# my ($self, $dirty) = @_;
		360	#
		361	# $MAPWIDGET->update;
		362	#}
		363
		364	sub conn::map_clear {
		365	my ($self) = @_;
		366
		367	$MAP->clear;
		368
		369	# refresh;
		370	}
		371
		372	sub conn::face_find {
		373	my ($self, $face) = @_;
		374
		375	$FACECACHE->{"$face->{chksum},$face->{name}"}
		376	}
		377
		378	sub conn::face_update {
		379	my ($self, $facenum, $face) = @_;
		380
		381	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		382
		383	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		384
		385	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
		386	$MAPWIDGET->update;
		387	}
		388
		389	sub conn::query {
		390	my ($self, $flags, $prompt) = @_;
		391
		392	#TODO
		393	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		394	}
		395
		396	sub conn::drawinfo {
		397	my ($self, $color, $text) = @_;
		398
		399	my @color = (
		400	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		401	[1.00, 1.00, 1.00],
		402	[0.00, 0.00, 0.55],
		403	[1.00, 0.00, 0.00],
		404	[1.00, 0.54, 0.00],
		405	[0.11, 0.56, 1.00],
		406	[0.93, 0.46, 0.00],
		407	[0.18, 0.54, 0.34],
		408	[0.56, 0.73, 0.56],
		409	[0.80, 0.80, 0.80],
		410	[0.55, 0.41, 0.13],
		411	[0.99, 0.77, 0.26],
		412	[0.74, 0.65, 0.41],
		413	);
		414
		415	$LOGVIEW->add_paragraph ($color[$color], $text);
103	}	416	}
104		417
105	%SDL_CB = (	418	%SDL_CB = (
106	SDL_QUIT() => sub {	419	SDL_QUIT() => sub {
107	main_quit Gtk2;	420	Event::unloop -1;
108	},	421	},
109	SDL_VIDEORESIZE() => sub {	422	SDL_VIDEORESIZE() => sub {
110	},	423	},
111	SDL_VIDEOEXPOSE() => sub {	424	SDL_VIDEOEXPOSE() => sub {
112	refresh;	425	refresh;
113	},	426	},
114	SDL_KEYDOWN() => sub {	427	SDL_KEYDOWN() => sub {
115	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	428	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
116	# alt-enter	429	# alt-enter
		430	destroy_screen;
117	$CFG->{fullscreen} = !$CFG->{fullscreen};	431	$CFG->{fullscreen} = !$CFG->{fullscreen};
118	init_screen;	432	init_screen;
119	} else {	433	} else {
120	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);	434	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
121	}	435	}
122	},	436	},
123	SDL_KEYUP() => sub {	437	SDL_KEYUP() => sub {
124	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);	438	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
125	},	439	},
126	SDL_MOUSEMOTION() => sub {	440	SDL_MOUSEMOTION() => sub {
127	warn "sdl motion\n";#d#	441	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
128	},	442	},
129	SDL_MOUSEBUTTONDOWN() => sub {	443	SDL_MOUSEBUTTONDOWN() => sub {
130	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);	444	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
131	},	445	},
132	SDL_MOUSEBUTTONUP() => sub {	446	SDL_MOUSEBUTTONUP() => sub {
133	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);	447	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
134	},	448	},
135	SDL_ACTIVEEVENT() => sub {	449	SDL_ACTIVEEVENT() => sub {
136	warn "active\n";#d#	450	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
137	},	451	},
138	);	452	);
139		453
140	@conn::ISA = Crossfire::Protocol::;
141
142	sub conn::map_update {
143	my ($self, $dirty) = @_;
144
145	refresh;
146	}
147
148	sub conn::map_scroll {
149	my ($self, $dx, $dy) = @_;
150
151	refresh;
152	}
153
154	sub conn::map_clear {
155	my ($self) = @_;
156
157	refresh;
158	}
159
160	sub conn::face_find {
161	my ($self, $face) = @_;
162
163	$FACECACHE->{"$face->{chksum},$face->{name}"}
164	}
165
166	sub conn::face_update {
167	my ($self, $face) = @_;
168
169	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
170
171	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
172	}
173
174	sub gtk_add_cfg_field {
175	my ($tbl, $cfg, $klbl, $key, $value) = @_;
176	my $i = $cfg->{_i}++;
177	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
178	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
179	if ($key eq 'password') {
180	$ent->set_invisible_char ("*");
181	$ent->set (visibility => 0)
182	}
183	$ent->set_text ($value);
184	$ent->signal_connect (changed => sub {
185	my ($ent) = @_;
186	$cfg->{$key} = $ent->get_text;
187	});
188	}
189
190	sub run_config_dialog {
191	my (%events) = @_;
192
193	my $w = Gtk2::Window->new;
194
195	my @cfg = (
196	[qw/Host host/],
197	[qw/Port port/],
198	[qw/Username user/],
199	[qw/Password password/],
200	);
201
202	my $cfg = {};
203
204	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
205	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
206
207	$w->add (my $vb = Gtk2::VBox->new);
208	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
209	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
210	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
211	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
212	my $i = 0;
213	my $act = 0;
214	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
215	if ($_ eq $selmode) { $act = $i }
216	$cb->append_text ($_);
217	$i++;
218	}
219	$cb->set_active ($act);
220	$cb->signal_connect (changed => sub {
221	my ($cb) = @_;
222	my $txt = $cb->get_active_text;
223	if ($txt =~ m/(\d+)x(\d+)/) {
224	$::CFG->{width} = $1;
225	$::CFG->{height} = $2;
226	}
227	});
228
229	$cfg->{_i} = 1;
230	for (@cfg) {
231	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
232	}
233
234	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
235	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
236	$cb->signal_connect (clicked => sub {
237	for (keys %$cfg) {
238	$::CFG->{$_} = $cfg->{$_}
239	if $_ ne '_i';
240	}
241	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
242	});
243	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
244	$cb->signal_connect (clicked => sub {
245	for (keys %$cfg) {
246	$::CFG->{$_} = $cfg->{$_}
247	if $_ ne '_i';
248	}
249	my $cb = $events{login} \|\| sub {};
250	$cb->($::CFG->{user}, $::CFG->{password});
251	});
252	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
253	$cb->signal_connect (clicked => sub {
254	my $cb = $events{login} \|\| sub {};
255	$cb->();
256	});
257	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
258	$cb->signal_connect (clicked => sub { $w->destroy });
259
260	$w->show_all;
261
262	$w->signal_connect (destroy => sub { Gtk2->main_quit });
263	}
264
265
266	#############################################################################	454	#############################################################################
267		455
268	SDL::Init SDL_INIT_EVERYTHING;
269
270	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
271
272	$mapwidget->activate;
273	$mapwidget->focus_in;
274
275	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";	456	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
276		457
277	$CFG \|\|= {	458	my %DEF_CFG = (
278	width => 640,	459	width => 640,
279	height => 480,	460	height => 480,
		461	fast => 0,
		462	fow_enable => 1,
		463	fow_intensity => 0.45,
		464	fow_smooth => 0,
280	fullscreen => 0,	465	fullscreen => 0,
		466	sdl_mode => 0,
		467	mapsize => 100,
281	host => "crossfire.schmorp.de",	468	host => "crossfire.schmorp.de",
282	port => 13327,	469	port => 13327,
283	};	470	);
		471
		472	while (my ($k, $v) = each %DEF_CFG) {
		473	$CFG->{$k} = $v unless exists $CFG->{$k};
		474	}
		475
		476	sdl_init;
		477
		478	@SDL_MODES = reverse
		479	grep $_->[0] >= 640 && $_->[1] >= 480,
		480	map [SDL::RectW ($_), SDL::RectH ($_)],
		481	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		482
		483	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		484
		485	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		486
		487	init_screen;
		488
		489	{
		490	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		491
		492	CFClient::add_font $_ for @fonts;
		493	CFClient::set_font $fonts[0];
		494	}
284		495
285	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	496	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
286		497
287	SDL::TTFInit;	498	Event::loop;
288
289	$GUIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", 12
290	or die "TTFOpenFont: $!";
291
292	run_config_dialog
293	login => sub { start_game },
294	logout => sub { stop_game };
295
296	main Gtk2;
297		499
298	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	500	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		501

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.24 by root, Fri Apr 7 20:34:44 2006 UTC vs. Revision 1.99 by root, Fri Apr 14 02:03:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.24 by root, Fri Apr 7 20:34:44 2006 UTC vs.
Revision 1.99 by root, Fri Apr 14 02:03:11 2006 UTC