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.14 by elmex, Fri Apr 7 16:36:44 2006 UTC vs.
Revision 1.23 by elmex, Fri Apr 7 20:15:01 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3use strict; 2use strict;
4 3
5use Glib; 4use Glib;
6use Gtk2 -init; 5use Gtk2 -init;
7 6
… …
14 13
15use Crossfire; 14use Crossfire;
16use Crossfire::Client; 15use Crossfire::Client;
17use Crossfire::Protocol; 16use Crossfire::Protocol;
18 17
19use Client::Util; 18use Crossfire::Client::Util;
19use Crossfire::Client::Widget;
20
21our $FACECACHE;
20 22
21our $VERSION = '0.1'; 23our $VERSION = '0.1';
22 24
23our $CFG; 25our $CFG;
24our $CONN; 26our $CONN;
… …
26our $SDL_TIMER; 28our $SDL_TIMER;
27our $SDL_APP; 29our $SDL_APP;
28our $SDL_EV = new SDL::Event; 30our $SDL_EV = new SDL::Event;
29our %SDL_CB; 31our %SDL_CB;
30 32
33our @GL_INIT; # hooks called on every gl init
34
31sub init_screen { 35sub init_screen {
32 # nuke all gl context data
33
34 $SDL_APP = new SDL::App 36 $SDL_APP = new SDL::App
35 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 37 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
36 -title => "Crossfire+ Client", 38 -title => "Crossfire+ Client",
37 -width => $CFG->{width}, 39 -width => $CFG->{width},
38 -height => $CFG->{height}, 40 -height => $CFG->{height},
… …
42 -blue_size => 8, 44 -blue_size => 8,
43 -double_buffer => 1, 45 -double_buffer => 1,
44 -fullscreen => $CFG->{fullscreen}, 46 -fullscreen => $CFG->{fullscreen},
45 -resizeable => 0; 47 -resizeable => 0;
46 48
49 glClearColor 0, 0, 0, 0;
50
47 glEnable GL_TEXTURE_2D; 51 glEnable GL_TEXTURE_2D;
48 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 52 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
49 glShadeModel GL_FLAT; 53 glShadeModel GL_FLAT;
50 glDisable GL_DEPTH_TEST; 54 glDisable GL_DEPTH_TEST;
51 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 55 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
52 glEnable GL_BLEND; 56 glEnable GL_BLEND;
53 57
54 glMatrixMode GL_PROJECTION; 58 glMatrixMode GL_PROJECTION;
55 glLoadIdentity; 59 glLoadIdentity;
56 glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1; 60 glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -100 , 100;
57 61
58 # re-bind all textures 62 glMatrixMode GL_MODELVIEW;
63
64 $_->() for @GL_INIT;
59} 65}
60 66
61sub start_game { 67sub start_game {
62 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 68 $SDL_TIMER = add Glib::Timeout 1000/20, sub {
63 while ($SDL_EV->poll) { 69 while ($SDL_EV->poll) {
… …
80 undef $SDL_APP; 86 undef $SDL_APP;
81 SDL::Quit; 87 SDL::Quit;
82} 88}
83 89
84sub refresh { 90sub refresh {
85 glClearColor 0, 0, 0, 0;
86 glClear GL_COLOR_BUFFER_BIT; 91 glClear GL_COLOR_BUFFER_BIT;
87 92
88 my $map = $CONN->{map}; 93 $_->draw for values %Crossfire::Client::Widget::ACTIVE_WIDGETS;
89
90 for my $x (0 .. $CONN->{mapw} - 1) {
91 for my $y (0 .. $CONN->{maph} - 1) {
92
93 my $cell = $map->[$x][$y]
94 or next;
95
96 my $darkness = $cell->[3] * (1 / 255);
97 glColor $darkness, $darkness, $darkness;
98
99 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
100 my $tex = $CONN->{face}[$num]{texture} || 0;
101
102 glBindTexture GL_TEXTURE_2D, $tex;
103
104 glBegin GL_QUADS;
105 glTexCoord 0, 0; glVertex $x, $y;
106 glTexCoord 0, 1; glVertex $x, $y + 1;
107 glTexCoord 1, 1; glVertex $x + 1, $y + 1;
108 glTexCoord 1, 0; glVertex $x + 1, $y;
109 glEnd;
110 }
111 }
112 }
113 94
114 SDL::GLSwapBuffers; 95 SDL::GLSwapBuffers;
115} 96}
116 97
117%SDL_CB = ( 98%SDL_CB = (
118 SDL_QUIT() => sub { 99 SDL_QUIT() => sub {
119 warn "sdl quit\n";#d# 100 main_quit Gtk2;
120 exit;
121 }, 101 },
122 SDL_VIDEORESIZE() => sub { 102 SDL_VIDEORESIZE() => sub {
123 }, 103 },
124 SDL_VIDEOEXPOSE() => sub { 104 SDL_VIDEOEXPOSE() => sub {
125 refresh; 105 refresh;
126 }, 106 },
127 SDL_KEYDOWN() => sub { 107 SDL_KEYDOWN() => sub {
108 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
109 # alt-enter
110 $CFG->{fullscreen} = !$CFG->{fullscreen};
111 init_screen;
112 } else {
113 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
114 }
128 }, 115 },
129 SDL_KEYUP() => sub { 116 SDL_KEYUP() => sub {
117 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
130 }, 118 },
131 SDL_MOUSEMOTION() => sub { 119 SDL_MOUSEMOTION() => sub {
132 warn "sdl motion\n";#d# 120 warn "sdl motion\n";#d#
133 }, 121 },
134 SDL_MOUSEBUTTONDOWN() => sub { 122 SDL_MOUSEBUTTONDOWN() => sub {
123 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
135 }, 124 },
136 SDL_MOUSEBUTTONUP() => sub { 125 SDL_MOUSEBUTTONUP() => sub {
126 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
137 }, 127 },
138 SDL_ACTIVEEVENT() => sub { 128 SDL_ACTIVEEVENT() => sub {
139 warn "active\n";#d# 129 warn "active\n";#d#
140 }, 130 },
141); 131);
… …
158 my ($self) = @_; 148 my ($self) = @_;
159 149
160 refresh; 150 refresh;
161} 151}
162 152
153sub conn::face_find {
154 my ($self, $face) = @_;
155
156 $FACECACHE->{"$face->{chksum},$face->{name}"}
157}
158
163sub conn::face_update { 159sub conn::face_update {
164 my ($self, $num, $face) = @_; 160 my ($self, $face) = @_;
165 161
166 my $pb = new Gtk2::Gdk::PixbufLoader; 162 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
167 $pb->write ($face->{image});
168 $pb->close;
169 163
170 $pb = $pb->get_pixbuf; 164 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
171 $pb = $pb->add_alpha (0, 0, 0, 0); 165}
172 166
173 glGetError(); 167sub gtk_add_cfg_field {
174 my ($tex) = @{glGenTextures 1}; 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}
175 182
176 $face->{texture} = $tex; 183sub 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/],
177 193 );
178 glBindTexture GL_TEXTURE_2D, $tex; 194
179 my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr; 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;
180 219 }
181 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 220 });
182 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 221
183 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 222 $cfg->{_i} = 1;
184 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 223 for (@cfg) {
185 224 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
186 glTexImage2D GL_TEXTURE_2D, 0, 225 }
187 GL_RGBA8, 226
188 $pb->get_width, $pb->get_height, 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';
189 0, 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';
190 GL_RGBA, 241 }
191 GL_UNSIGNED_BYTE, 242 my $cb = $events{login} || sub {};
192 $pb->get_pixels; 243 $cb->($::CFG->{user}, $::CFG->{password});
193 my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr; 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 });
194} 256}
257
195 258
196############################################################################# 259#############################################################################
197 260
261SDL::Init(SDL_INIT_EVERYTHING());
262
263my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
264
265find_rcfile "uifont.ttf";
266
267$mapwidget->activate;
268$mapwidget->focus_in;
269
198Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; 270Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
271
272$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
199 273
200$CFG ||= { 274$CFG ||= {
201 width => 640, 275 width => 640,
202 height => 480, 276 height => 480,
203 fullscreen => 0, 277 fullscreen => 0,
204 host => "crossfire.schmorp.de", 278 host => "crossfire.schmorp.de",
205 port => 13327, 279 port => 13327,
206}; 280};
207 281
208Client::Util::run_config_dialog 282run_config_dialog
209 login => sub { print "Login $_[0] with $_[1]\n" }, 283 login => sub { start_game },
210 logout => sub { print "Logout" }; 284 logout => sub { stop_game };
211 285
212main Gtk2; 286main Gtk2;
213 287
288Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

Diff Legend

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