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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.35 by root, Sat Apr 8 18:48:35 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.35 by root, Sat Apr 8 18:48:35 2006 UTC vs. Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.35 by root, Sat Apr 8 18:48:35 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC