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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.23 by elmex, Fri Apr 7 20:15:01 2006 UTC vs.
Revision 1.117 by root, Sun Apr 16 07:39:51 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 Compress::LZF;
19	use Crossfire::Client::Widget;
20		19
21	our $FACECACHE;	20	use CFClient;
		21	use CFClient::UI;
22		22
23	our $VERSION = '0.1';	23	our $VERSION = '0.1';
		24
		25	my $MAX_FPS = 60;
		26	my $MIN_FPS = 5; # unused as of yet
		27
		28	our $META_SERVER = "crossfire.real-time.com:13326";
		29
		30	our $FACEMAP;
		31	our $TILECACHE;
		32	our $MAPCACHE;
		33
		34	our $LAST_REFRESH;
		35	our $NOW;
24		36
25	our $CFG;	37	our $CFG;
26	our $CONN;	38	our $CONN;
		39	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
27		40
		41	our @SDL_MODES;
		42	our $WIDTH;
		43	our $HEIGHT;
		44	our $FULLSCREEN;
		45	our $FONTSIZE;
		46
		47	our $MAP;
		48	our $MAPWIDGET;
		49	our $BUTTONBAR;
		50	our $LOGVIEW;
		51	our $CONSOLE;
		52	our $METASERVER;
		53
28	our $SDL_TIMER;	54	our $SDL_ACTIVE;
29	our $SDL_APP;	55	our $SDL_EV;
30	our $SDL_EV = new SDL::Event;
31	our %SDL_CB;	56	our %SDL_CB;
32		57
33	our @GL_INIT; # hooks called on every gl init	58	our $ALT_ENTER_MESSAGE;
		59	our $STATUS_LINE;
		60	our $DEBUG_STATUS;
		61
		62	sub status {
		63	$STATUS_LINE->set_text ($_[0]);
		64	my ($w, $h) = $STATUS_LINE->size_request;
		65	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
		66	}
		67
		68	sub debug {
		69	$DEBUG_STATUS->set_text ($_[0]);
		70	my ($w, $h) = $DEBUG_STATUS->size_request;
		71	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
		72	}
		73
		74	sub start_game {
		75	status "logging in...";
		76
		77	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		78
		79	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
		80
		81	$MAP = new CFClient::Map $mapsize, $mapsize;
		82
		83	my ($host, $port) = split /:/, $CFG->{host};
		84
		85	$CONN = new conn
		86	host => $host,
		87	port => $port \|\| 13327,
		88	user => $CFG->{user},
		89	pass => $CFG->{password},
		90	mapw => $mapsize,
		91	maph => $mapsize,
		92	;
		93
		94	status "login successful";
		95
		96	CFClient::lowdelay fileno $CONN->{fh};
		97	}
		98
		99	sub stop_game {
		100	undef $CONN;
		101	}
		102
		103	sub client_setup {
		104	my $dialog = new CFClient::UI::FancyFrame
		105	child => (my $vbox = new CFClient::UI::VBox);
		106	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
		107	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		108
		109	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		110	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		111
		112	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		113	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		114
		115	$mode_slider->connect (changed => sub {
		116	my ($self, $value) = @_;
		117
		118	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		119	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		120	});
		121	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		122
		123	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		124	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		125	my ($self, $value) = @_;
		126	$CFG->{fullscreen} = $value;
		127	});
		128
		129	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		130	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		131	my ($self, $value) = @_;
		132	$CFG->{fast} = $value;
		133	});
		134
		135	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		136	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		137	my ($self, $value) = @_;
		138	$CFG->{fow_enable} = $value;
		139	});
		140
		141	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
		142	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		143	my ($self, $value) = @_;
		144	$CFG->{fow_intensity} = $value;
		145	});
		146
		147	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		148	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		149	my ($self, $value) = @_;
		150	$CFG->{fow_smooth} = $value;
		151	});
		152
		153	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		154	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		155	my ($self, $value) = @_;
		156	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		157	});
		158
		159	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		160	destroy_screen ();
		161	init_screen ();
		162	});
		163
		164	$dialog
		165	}
		166
		167	sub metaserver_dialog {
		168	my $dialog = new CFClient::UI::FancyFrame
		169	child => (my $vbox = new CFClient::UI::VBox);
		170
		171	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		172
		173	$dialog
		174	}
		175
		176	sub update_metaserver {
		177	my ($HOST) = @_;
		178
		179	status "fetching metaserver list...";
		180
		181	my $buf;
		182
		183	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		184
		185	Event->io (fd => $fh, poll => 'r', cb => sub {
		186	my $res = sysread $fh, $buf, 8192, length $buf;
		187
		188	if (!defined $res) {
		189	$_[0]->w->cancel;
		190	status "metaserver: $!";
		191	} elsif ($res == 0) {
		192	$_[0]->w->cancel;
		193	status "server list retrieved";
		194
		195	my $table = $METASERVER->{table};
		196
		197	$table->clear;
		198
		199	my @col = qw(Use #Users Host Uptime Version Description);
		200	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		201	for 0 .. $#col;
		202
		203	my @align = qw(1 0 1 1 -1);
		204
		205	my $y = 0;
		206	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		207	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		208
		209	for ($desc) {
		210	s/<br>/\n/gi;
		211	s/<li>/\n· /gi;
		212	s/<.*?>//sgi;
		213	s/&/&/g;
		214	s/</</g;
		215	s/>/>/g;
		216	}
		217
		218	$uptime = sprintf "%dd %02d:%02d:%02d",
		219	(int $m->[8] / 86400),
		220	(int $m->[8] / 3600) % 24,
		221	(int $m->[8] / 60) % 60,
		222	$m->[8] % 60;
		223
		224	$m = [$users, $host, $uptime, $version, $desc];
		225
		226	$y++;
		227
		228	$table->add (0, $y, new CFClient::UI::VBox children => [
		229	(new CFClient::UI::Button text => " ", connect_activate => sub {
		230	$HOST->set_text ($CFG->{host} = $host);
		231	}),
		232	(new CFClient::UI::Empty expand => 1),
		233	]);
		234
		235	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		236	for 0 .. $#$m;
		237	}
		238	}
		239	});
		240	}
		241
		242	sub server_setup {
		243	my $dialog = new CFClient::UI::FancyFrame
		244	child => (my $vbox = new CFClient::UI::VBox);
		245
		246	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
		247	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		248	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
		249
		250	{
		251	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
		252
		253	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		254	my ($self, $value) = @_;
		255	$CFG->{host} = $value;
		256	});
		257
		258	$METASERVER = metaserver_dialog;
		259
		260	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		261	update_metaserver $HOST;
		262	});
		263	}
		264
		265	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		266	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		267	my ($self, $value) = @_;
		268	$CFG->{user} = $value;
		269	});
		270
		271	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		272	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		273	my ($self, $value) = @_;
		274	$CFG->{password} = $value;
		275	});
		276
		277	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		278	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		279	my ($self, $value) = @_;
		280	$CFG->{say_command} = $value;
		281	});
		282
		283	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
		284	$table->add (1, 7, new CFClient::UI::Slider
		285	req_w => 100,
		286	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		287	connect_changed => sub {
		288	my ($self, $value) = @_;
		289
		290	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		291	},
		292	);
		293
		294	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		295	start_game;
		296	});
		297
		298	$dialog
		299	}
		300
		301	sub message_window {
		302	my $window = new CFClient::UI::FancyFrame
		303	border_bg => [1, 1, 1, 0.5],
		304	bg => [0.3, 0.3, 0.3, 0.8],
		305	user_w => $::WIDTH/4,
		306	user_h => $::HEIGHT,
		307	child => (my $vbox = new CFClient::UI::VBox);
		308
		309	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		310	expand => 1,
		311	fontsize => $::CFG->{log_fontsize},
		312	);
		313
		314	$vbox->add (my $input = new CFClient::UI::LineEntry
		315	connect_activate => sub {
		316	my ($input, $text) = @_;
		317	$input->set_text ('');
		318
		319	if ($text =~ /^\/(.*)/) {
		320	$::CONN->user_send ("command $1");
		321	} else {
		322	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		323	$::CONN->user_send ("command $say_cmd $text");
		324	}
		325	},
		326	connect_escape => sub {
		327	$MAPWIDGET->focus_in
		328	},
		329	);
		330
		331	$CONSOLE = {
		332	window => $window,
		333	input => $input
		334	};
		335
		336	$window
		337	}
		338
		339	sub sdl_init {
		340	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		341	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		342	and die "SDL::Init failed!\n";
		343	}
34		344
35	sub init_screen {	345	sub init_screen {
36	$SDL_APP = new SDL::App	346	sdl_init;
37	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
38	-title => "Crossfire+ Client",
39	-width => $CFG->{width},
40	-height => $CFG->{height},
41	-opengl => 1,
42	-red_size => 8,
43	-green_size => 8,
44	-blue_size => 8,
45	-double_buffer => 1,
46	-fullscreen => $CFG->{fullscreen},
47	-resizeable => 0;
48		347
49	glClearColor 0, 0, 0, 0;	348	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		349	$FULLSCREEN = $CFG->{fullscreen};
		350	$FAST = $CFG->{fast};
50		351
51	glEnable GL_TEXTURE_2D;	352	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
52	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	353	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
53	glShadeModel GL_FLAT;	354	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
54	glDisable GL_DEPTH_TEST;	355	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
55	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
56	glEnable GL_BLEND;
57		356
58	glMatrixMode GL_PROJECTION;	357	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
59	glLoadIdentity;	358	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
60	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -100 , 100;	359	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		360	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
61		361
62	glMatrixMode GL_MODELVIEW;	362	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		363	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		364	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
63		365
64	$_->() for @GL_INIT;	366	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
65	}	367	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		368	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		369	or die "SDL::SetVideoMode failed!\n";
66		370
67	sub start_game {	371	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
68	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	372
69	while ($SDL_EV->poll) {	373	$SDL_EV = new SDL::Event;
70	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	374	$SDL_EV->set_unicode (1);
		375
		376	$SDL_ACTIVE = 1;
		377
		378	$LAST_REFRESH = time - 0.01;
		379
		380	CFClient::gl_init;
		381
		382	$FONTSIZE = int $HEIGHT / 40;
		383
		384	#############################################################################
		385
		386	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
		387	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
		388
		389	$STATUS_LINE = new CFClient::UI::Label
		390	padding => 0,
		391	y => $HEIGHT * 44 / 45 - $FONTSIZE;
		392	$CFClient::UI::ROOT->add ($STATUS_LINE);
		393
		394	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		395	padding => 0,
		396	y => $HEIGHT * 44 / 45,
		397	height => $HEIGHT / 45,
		398	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		399	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
		400
		401	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
		402	$MAPWIDGET->focus_in;
		403	$MAPWIDGET->connect (activate_console => sub {
		404	my ($mapwidget, $preset) = @_;
		405
		406	if ($CONSOLE) {
		407	$CONSOLE->{input}->focus_in;
		408
		409	if ($preset && $CONSOLE->{input}->get_text eq '') {
		410	$CONSOLE->{input}->set_text ($preset);
		411	}
71	}	412	}
		413	});
72		414
		415	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		416
		417	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		418	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		419	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		420
		421	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		422	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		423	status "Configuration Saved";
		424	});
		425
		426	$BUTTONBAR->{children}[0]->emit ("activate");
		427	}
		428
		429	sub destroy_screen {
		430	$CFClient::UI::ROOT->{children} = [];
		431	undef $SDL_ACTIVE;
		432	undef $SDL_EV;
		433	SDL::Quit;
		434	}
		435
		436	my %animate_object;
		437	my $animate_timer;
		438
		439	my $want_refresh;
		440	my $can_refresh;
		441
		442	my $fps = 9;
		443
		444	sub force_refresh {
		445	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		446	debug sprintf "%3.2f", $fps;
		447
		448	$want_refresh = 0;
		449	$can_refresh = 0;
		450
		451	$CFClient::UI::ROOT->draw;
		452
		453	SDL::GLSwapBuffers;
		454
		455	$LAST_REFRESH = $NOW;
		456	}
		457
		458	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		459	$NOW = time;
		460
		461	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		462	while $SDL_EV->poll;
		463
		464	if (%animate_object) {
		465	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		466	$want_refresh++;
		467	}
		468
		469	if ($want_refresh) {
		470	force_refresh;
		471	} else {
		472	$can_refresh = 1;
		473	}
		474	});
		475
		476	sub refresh {
		477	$want_refresh++;
		478	}
		479
		480	sub animation_start {
		481	my ($widget) = @_;
		482	$animate_object{$widget} = $widget;
		483	}
		484
		485	sub animation_stop {
		486	my ($widget) = @_;
		487	delete $animate_object{$widget};
		488	}
		489
		490	@conn::ISA = Crossfire::Protocol::;
		491
		492	sub conn::user_send {
		493	my ($self, $command) = @_;
		494
		495	$self->send ($command);
		496	status $command;
		497	}
		498
		499	sub conn::feed_map1a {
		500	my ($self, $data) = @_;
		501
		502	# $self->Crossfire::Protocol::feed_map1a ($data);
		503
		504	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		505	$MAP->map1a_update ($data);
		506	$MAPWIDGET->update;
		507	}
		508
		509	sub conn::flush_map {
		510	my ($self) = @_;
		511
		512	my $map_info = delete $self->{map_info}
		513	or return;
		514
		515	my ($hash, $x, $y, $w, $h) = @$map_info;
		516
		517	my $data = $MAP->get_rect ($x, $y, $w, $h);
		518	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		519
		520	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		521
		522	}
		523
		524	sub conn::map_clear {
		525	my ($self) = @_;
		526
		527	$self->flush_map;
		528
		529	$MAP->clear;
		530	}
		531
		532	sub conn::map_info {
		533	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		534
		535	$self->flush_map;
		536
		537	$x = $::MAP->ox - $x;
		538	$y = $::MAP->oy - $y;
		539
		540	$self->{map_info} = [$hash, $x, $y, $w, $h];
		541
		542	if (defined (my $data = $MAPCACHE->get ($hash))) {
		543	$data = Compress::LZF::decompress $data;
		544	warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d#
		545	for my $id ($MAP->set_rect ($x, $y, $data)) {
		546	my $data = $TILECACHE->get ($id)
		547	or next;
		548
		549	$self->set_texture ($id => $data);
73	1	550	}
		551	}
		552	}
		553
		554	sub conn::face_find {
		555	my ($self, $facenum, $face) = @_;
		556
		557	my $hash = "$face->{chksum},$face->{name}";
		558
		559	my $id = $FACEMAP->get ($hash);
		560
		561	unless ($id) {
		562	# create new id for face
		563	# i love transactions
		564	for (1..100) {
		565	my $txn = $CFClient::DB_ENV->txn_begin;
		566	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		567	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		568	$id++;
		569	if ($FACEMAP->put (id => $id) == 0
		570	&& $FACEMAP->put ($hash => $id) == 0) {
		571	$txn->txn_commit;
		572
		573	goto gotid;
		574	}
		575	}
		576	$txn->abort;
		577	}
		578
		579	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		580	}
		581
		582	gotid:
		583	$face->{id} = $id;
		584	$MAP->set_face ($facenum => $id);
		585	$TILECACHE->get ($id)
		586	}
		587
		588	sub conn::face_update {
		589	my ($self, $facenum, $face) = @_;
		590
		591	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
		592
		593	$self->set_texture ($face->{id} => delete $face->{image});
		594	}
		595
		596	sub conn::set_texture {
		597	my ($self, $id, $data) = @_;
		598
		599	$self->{texture}[$id] \|\|= do {
		600	my $tex =
		601	new_from_image CFClient::Texture
		602	$data, minify => 1;
		603
		604	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		605	$MAPWIDGET->update;
		606
		607	$tex
74	};	608	};
75
76	init_screen;
77
78	$CONN = new conn
79	host => $CFG->{host},
80	port => $CFG->{port};
81	}	609	}
82		610
83	sub stop_game {	611	sub conn::query {
84	remove Glib::Source $SDL_TIMER;	612	my ($self, $flags, $prompt) = @_;
85		613
86	undef $SDL_APP;	614	#TODO
87	SDL::Quit;	615	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
88	}	616	}
89		617
90	sub refresh {	618	sub conn::drawinfo {
91	glClear GL_COLOR_BUFFER_BIT;	619	my ($self, $color, $text) = @_;
92		620
93	$_->draw for values %Crossfire::Client::Widget::ACTIVE_WIDGETS;	621	my @color = (
		622	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		623	[1.00, 1.00, 1.00],
		624	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
		625	[1.00, 0.00, 0.00],
		626	[1.00, 0.54, 0.00],
		627	[0.11, 0.56, 1.00],
		628	[0.93, 0.46, 0.00],
		629	[0.18, 0.54, 0.34],
		630	[0.56, 0.73, 0.56],
		631	[0.80, 0.80, 0.80],
		632	[0.55, 0.41, 0.13],
		633	[0.99, 0.77, 0.26],
		634	[0.74, 0.65, 0.41],
		635	);
94		636
95	SDL::GLSwapBuffers;	637	$LOGVIEW->add_paragraph ($color[$color], $text);
96	}	638	}
97		639
98	%SDL_CB = (	640	%SDL_CB = (
99	SDL_QUIT() => sub {	641	SDL_QUIT() => sub {
100	main_quit Gtk2;	642	Event::unloop -1;
101	},	643	},
102	SDL_VIDEORESIZE() => sub {	644	SDL_VIDEORESIZE() => sub {
103	},	645	},
104	SDL_VIDEOEXPOSE() => sub {	646	SDL_VIDEOEXPOSE() => sub {
105	refresh;	647	refresh;
106	},	648	},
107	SDL_KEYDOWN() => sub {	649	SDL_KEYDOWN() => sub {
108	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	650	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
109	# alt-enter	651	# alt-enter
		652	destroy_screen;
110	$CFG->{fullscreen} = !$CFG->{fullscreen};	653	$CFG->{fullscreen} = !$CFG->{fullscreen};
111	init_screen;	654	init_screen;
112	} else {	655	} else {
113	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);	656	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
114	}	657	}
115	},	658	},
116	SDL_KEYUP() => sub {	659	SDL_KEYUP() => sub {
117	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);	660	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
118	},	661	},
119	SDL_MOUSEMOTION() => sub {	662	SDL_MOUSEMOTION() => sub {
120	warn "sdl motion\n";#d#	663	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
121	},	664	},
122	SDL_MOUSEBUTTONDOWN() => sub {	665	SDL_MOUSEBUTTONDOWN() => sub {
123	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);	666	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
124	},	667	},
125	SDL_MOUSEBUTTONUP() => sub {	668	SDL_MOUSEBUTTONUP() => sub {
126	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);	669	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
127	},	670	},
128	SDL_ACTIVEEVENT() => sub {	671	SDL_ACTIVEEVENT() => sub {
129	warn "active\n";#d#	672	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
130	},	673	},
131	);	674	);
132		675
133	@conn::ISA = Crossfire::Protocol::;
134
135	sub conn::map_update {
136	my ($self, $dirty) = @_;
137
138	refresh;
139	}
140
141	sub conn::map_scroll {
142	my ($self, $dx, $dy) = @_;
143
144	refresh;
145	}
146
147	sub conn::map_clear {
148	my ($self) = @_;
149
150	refresh;
151	}
152
153	sub conn::face_find {
154	my ($self, $face) = @_;
155
156	$FACECACHE->{"$face->{chksum},$face->{name}"}
157	}
158
159	sub conn::face_update {
160	my ($self, $face) = @_;
161
162	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
163
164	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
165	}
166
167	sub gtk_add_cfg_field {
168	my ($tbl, $cfg, $klbl, $key, $value) = @_;
169	my $i = $cfg->{_i}++;
170	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
171	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
172	if ($key eq 'password') {
173	$ent->set_invisible_char ("*");
174	$ent->set (visibility => 0)
175	}
176	$ent->set_text ($value);
177	$ent->signal_connect (changed => sub {
178	my ($ent) = @_;
179	$cfg->{$key} = $ent->get_text;
180	});
181	}
182
183	sub run_config_dialog {
184	my (%events) = @_;
185
186	my $w = Gtk2::Window->new;
187
188	my @cfg = (
189	[qw/Host host/],
190	[qw/Port port/],
191	[qw/Username user/],
192	[qw/Password password/],
193	);
194
195	my $cfg = {};
196
197	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
198	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
199
200	$w->add (my $vb = Gtk2::VBox->new);
201	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
202	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
203	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
204	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
205	my $i = 0;
206	my $act = 0;
207	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
208	if ($_ eq $selmode) { $act = $i }
209	$cb->append_text ($_);
210	$i++;
211	}
212	$cb->set_active ($act);
213	$cb->signal_connect (changed => sub {
214	my ($cb) = @_;
215	my $txt = $cb->get_active_text;
216	if ($txt =~ m/(\d+)x(\d+)/) {
217	$::CFG->{width} = $1;
218	$::CFG->{height} = $2;
219	}
220	});
221
222	$cfg->{_i} = 1;
223	for (@cfg) {
224	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
225	}
226
227	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
228	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
229	$cb->signal_connect (clicked => sub {
230	for (keys %$cfg) {
231	$::CFG->{$_} = $cfg->{$_}
232	if $_ ne '_i';
233	}
234	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
235	});
236	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
237	$cb->signal_connect (clicked => sub {
238	for (keys %$cfg) {
239	$::CFG->{$_} = $cfg->{$_}
240	if $_ ne '_i';
241	}
242	my $cb = $events{login} \|\| sub {};
243	$cb->($::CFG->{user}, $::CFG->{password});
244	});
245	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
246	$cb->signal_connect (clicked => sub {
247	my $cb = $events{login} \|\| sub {};
248	$cb->();
249	});
250	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
251	$cb->signal_connect (clicked => sub { $w->destroy });
252
253	$w->show_all;
254
255	$w->signal_connect (destroy => sub { Gtk2->main_quit });
256	}
257
258
259	#############################################################################	676	#############################################################################
260		677
261	SDL::Init(SDL_INIT_EVERYTHING());	678	$TILECACHE = CFClient::db_table "tilecache";
		679	$FACEMAP = CFClient::db_table "facemap";
262		680
263	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
264
265	find_rcfile "uifont.ttf";
266
267	$mapwidget->activate;
268	$mapwidget->focus_in;
269
270	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";	681	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
271		682
272	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	683	my %DEF_CFG = (
273		684	sdl_mode => 0,
274	$CFG \|\|= {
275	width => 640,	685	width => 640,
276	height => 480,	686	height => 480,
277	fullscreen => 0,	687	fullscreen => 0,
		688	fast => 0,
		689	fow_enable => 1,
		690	fow_intensity => 0.45,
		691	fow_smooth => 0,
		692	log_fontsize => 14,
		693	mapsize => 100,
278	host => "crossfire.schmorp.de",	694	host => "crossfire.schmorp.de",
279	port => 13327,	695	say_command => 'say',
280	};	696	);
281		697
282	run_config_dialog	698	while (my ($k, $v) = each %DEF_CFG) {
283	login => sub { start_game },	699	$CFG->{$k} = $v unless exists $CFG->{$k};
284	logout => sub { stop_game };	700	}
285		701
286	main Gtk2;	702	sdl_init;
287		703
288	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	704	@SDL_MODES = reverse
		705	grep $_->[0] >= 640 && $_->[1] >= 480,
		706	map [SDL::RectW ($_), SDL::RectH ($_)],
		707	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		708
		709	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		710
		711	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		712
		713	init_screen;
		714
		715	{
		716	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		717
		718	CFClient::add_font $_ for @fonts;
		719	CFClient::set_font $fonts[0];
		720	}
		721
		722	Event::loop;
		723
		724

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.23 by elmex, Fri Apr 7 20:15:01 2006 UTC vs. Revision 1.117 by root, Sun Apr 16 07:39:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.23 by elmex, Fri Apr 7 20:15:01 2006 UTC vs.
Revision 1.117 by root, Sun Apr 16 07:39:51 2006 UTC