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

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.115 by root, Sat Apr 15 22:56:00 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.115 by root, Sat Apr 15 22:56:00 2006 UTC