ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.16 by elmex, Fri Apr 7 17:37:11 2006 UTC vs.
Revision 1.34 by elmex, Sat Apr 8 18:18:09 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
2use strict; 3use strict;
4use utf8;
3 5
4use Glib; 6use Glib;
5use Gtk2 -init; 7use Gtk2 -init;
6 8
7use SDL; 9use SDL;
… …
13 15
14use Crossfire; 16use Crossfire;
15use Crossfire::Client; 17use Crossfire::Client;
16use Crossfire::Protocol; 18use Crossfire::Protocol;
17 19
18use Client::Util;
19use Client::Widget; 20use Crossfire::Client::Widget;
21
22our $FACECACHE;
20 23
21our $VERSION = '0.1'; 24our $VERSION = '0.1';
25
26our %GL_EXT;
22 27
23our $CFG; 28our $CFG;
24our $CONN; 29our $CONN;
30
31our $WIDTH;
32our $HEIGHT;
33our $FULLSCREEN;
34
35our $UIFONT;
25 36
26our $SDL_TIMER; 37our $SDL_TIMER;
27our $SDL_APP; 38our $SDL_APP;
28our $SDL_EV = new SDL::Event; 39our $SDL_EV = new SDL::Event;
29our %SDL_CB; 40our %SDL_CB;
30 41
42our @GL_INIT; # hooks called on every gl init
43
44our $ALT_ENTER_MESSAGE;
45
46our $tw; # Test widget #d#
47
31sub init_screen { 48sub init_screen {
32 # nuke all gl context data
33
34 $SDL_APP = new SDL::App 49 $SDL_APP = new SDL::App
35 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 50 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
36 -title => "Crossfire+ Client", 51 -title => "Crossfire+ Client",
37 -width => $CFG->{width}, 52 -width => $WIDTH,
38 -height => $CFG->{height}, 53 -height => $HEIGHT,
39 -opengl => 1, 54 -opengl => 1,
40 -red_size => 8, 55 -red_size => 8,
41 -green_size => 8, 56 -green_size => 8,
42 -blue_size => 8, 57 -blue_size => 8,
43 -double_buffer => 1, 58 -double_buffer => 1,
44 -fullscreen => $CFG->{fullscreen}, 59 -fullscreen => $FULLSCREEN,
45 -resizeable => 0; 60 -resizeable => 0;
46 61
62 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
63
64 $GL_EXT{GL_ARB_texture_non_power_of_two}
65 or warn "WARNING: non-power-of-two opengl extension required";
66
67 $UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $HEIGHT / 40
68 or die "TTFOpenFont: $!";
69
70 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Alt-Enter toggles fullscreen mode";
71 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
72 $ALT_ENTER_MESSAGE->activate;
73
74 # Test code #d#
75 $tw = new Crossfire::Client::Widget::Window;
76 $tw->add (my $lbl = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!");
77# $tw = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!";
78
79 $tw->move (0, $HEIGHT - 50);
80 $tw->activate;
81 # Test code end #d#
82
83 glClearColor 0, 0, 0, 0;
84
47 glEnable GL_TEXTURE_2D; 85 glEnable GL_TEXTURE_2D;
48 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
49 glShadeModel GL_FLAT; 86 glShadeModel GL_FLAT;
50 glDisable GL_DEPTH_TEST; 87 glDisable GL_DEPTH_TEST;
51 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 88 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
52 glEnable GL_BLEND;
53 89
54 glMatrixMode GL_PROJECTION; 90 glMatrixMode GL_PROJECTION;
55 glLoadIdentity; 91 glLoadIdentity;
56 glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1; 92 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
57 93
58 # re-bind all textures 94 glMatrixMode GL_MODELVIEW;
95
96 $_->() for @GL_INIT;
59} 97}
60 98
61sub start_game { 99sub start_game {
62 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 100 $SDL_TIMER = add Glib::Timeout 1000/100, sub {
63 while ($SDL_EV->poll) {
64 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); 101 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
65 } 102 while $SDL_EV->poll;
66 103
67 1 104 1
68 }; 105 };
69 106
107 $WIDTH = $CFG->{width};
108 $HEIGHT = $CFG->{height};
109 $FULLSCREEN = 0;
110
70 init_screen; 111 init_screen;
71 112
72 $CONN = new conn 113 $CONN = new conn
73 host => $CFG->{host}, 114 host => $CFG->{host},
74 port => $CFG->{port}; 115 port => $CFG->{port},
116 user => $CFG->{user},
117 pass => $CFG->{password};
75} 118}
76 119
77sub stop_game { 120sub stop_game {
78 remove Glib::Source $SDL_TIMER; 121 remove Glib::Source $SDL_TIMER;
79 122
80 undef $SDL_APP; 123 undef $SDL_APP;
81 SDL::Quit; 124 SDL::Quit;
82} 125}
83 126
127
128sub force_refresh {
129 glViewport 0, 0, $WIDTH, $HEIGHT;
130 glClear GL_COLOR_BUFFER_BIT;
131
132 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;
133
134 SDL::GLSwapBuffers;
135}
136
137my $refresh_handler;
138
84sub refresh { 139sub refresh {
85 glClearColor 0, 0, 0, 0; 140 $refresh_handler ||= add Glib::Idle sub {
86 glClear GL_COLOR_BUFFER_BIT; 141 force_refresh;
87 142 undef $refresh_handler;
88 for (values %Client::Widget::ACTIVE_WIDGETS) { 143 0
89 $_->draw
90 } 144 };
91
92 SDL::GLSwapBuffers;
93} 145}
94 146
95%SDL_CB = ( 147%SDL_CB = (
96 SDL_QUIT() => sub { 148 SDL_QUIT() => sub {
97 warn "sdl quit\n";#d# 149 main_quit Gtk2;
98 exit;
99 }, 150 },
100 SDL_VIDEORESIZE() => sub { 151 SDL_VIDEORESIZE() => sub {
101 }, 152 },
102 SDL_VIDEOEXPOSE() => sub { 153 SDL_VIDEOEXPOSE() => sub {
103 refresh; 154 refresh;
104 }, 155 },
105 SDL_KEYDOWN() => sub { 156 SDL_KEYDOWN() => sub {
157 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
158 # alt-enter
159 $FULLSCREEN = !$FULLSCREEN;
160 init_screen;
161 } else {
106 Client::Widget::feed_sdl_key_down_event ($SDL_EV); 162 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
163 }
107 }, 164 },
108 SDL_KEYUP() => sub { 165 SDL_KEYUP() => sub {
109 Client::Widget::feed_sdl_key_up_event ($SDL_EV); 166 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
110 }, 167 },
111 SDL_MOUSEMOTION() => sub { 168 SDL_MOUSEMOTION() => sub {
112 warn "sdl motion\n";#d# 169 warn "sdl motion\n";#d#
113 }, 170 },
114 SDL_MOUSEBUTTONDOWN() => sub { 171 SDL_MOUSEBUTTONDOWN() => sub {
115 Client::Widget::feed_sdl_button_down_event ($SDL_EV); 172 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
116 }, 173 },
117 SDL_MOUSEBUTTONUP() => sub { 174 SDL_MOUSEBUTTONUP() => sub {
118 Client::Widget::feed_sdl_button_up_event ($SDL_EV); 175 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
119 }, 176 },
120 SDL_ACTIVEEVENT() => sub { 177 SDL_ACTIVEEVENT() => sub {
121 warn "active\n";#d# 178 warn "active\n";#d#
122 }, 179 },
123); 180);
… …
140 my ($self) = @_; 197 my ($self) = @_;
141 198
142 refresh; 199 refresh;
143} 200}
144 201
202sub conn::face_find {
203 my ($self, $face) = @_;
204
205 $FACECACHE->{"$face->{chksum},$face->{name}"}
206}
207
145sub conn::face_update { 208sub conn::face_update {
146 my ($self, $num, $face) = @_; 209 my ($self, $face) = @_;
147 210
148 my $pb = new Gtk2::Gdk::PixbufLoader; 211 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
149 $pb->write ($face->{image});
150 $pb->close;
151 212
152 $pb = $pb->get_pixbuf; 213 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
153 $pb = $pb->add_alpha (0, 0, 0, 0); 214}
154 215
155 glGetError(); 216sub conn::query {
156 my ($tex) = @{glGenTextures 1}; 217 my ($self, $flags, $prompt) = @_;
157 218
158 $face->{texture} = $tex; 219 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
220}
221
222sub 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
238sub 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/],
159 248 );
160 glBindTexture GL_TEXTURE_2D, $tex; 249
161 my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr; 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;
162 274 }
163 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 275 });
164 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 276
165 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 277 $cfg->{_i} = 1;
166 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 278 for (@cfg) {
167 279 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
168 glTexImage2D GL_TEXTURE_2D, 0, 280 }
169 GL_RGBA8, 281
170 $pb->get_width, $pb->get_height, 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';
171 0, 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';
172 GL_RGBA, 296 }
173 GL_UNSIGNED_BYTE, 297 my $cb = $events{login} || sub {};
174 $pb->get_pixels; 298 $cb->($::CFG->{user}, $::CFG->{password});
175 my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr; 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 });
176} 311}
312
177 313
178############################################################################# 314#############################################################################
179 315
316SDL::Init SDL_INIT_EVERYTHING;
317SDL::TTFInit;
318
180my $mapwidget = Client::MapWidget->new; 319my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
181 320
182$mapwidget->activate; 321$mapwidget->activate;
183$mapwidget->focus_in; 322$mapwidget->focus_in;
184 323
185Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; 324Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
186 325
187$CFG ||= { 326$CFG ||= {
188 width => 640, 327 width => 640,
189 height => 480, 328 height => 480,
190 fullscreen => 0, 329 fullscreen => 0,
191 host => "crossfire.schmorp.de", 330 host => "crossfire.schmorp.de",
192 port => 13327, 331 port => 13327,
193}; 332};
194 333
195Client::Util::run_config_dialog 334$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
335
336run_config_dialog
196 login => sub { start_game }, 337 login => sub { start_game },
197 logout => sub { stop_game }; 338 logout => sub { stop_game };
198 339
199main Gtk2; 340main Gtk2;
341
342Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

Diff Legend

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