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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.29 by elmex, Fri Apr 7 23:05:21 2006 UTC vs. Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.29 by elmex, Fri Apr 7 23:05:21 2006 UTC vs.
Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC