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.13 by root, Fri Apr 7 16:30:23 2006 UTC vs.
Revision 1.29 by elmex, Fri Apr 7 23:05:21 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use Glib; 6use Glib;
6use Gtk2 -init; 7use Gtk2 -init;
7 8
8use SDL; 9use SDL;
… …
14 15
15use Crossfire; 16use Crossfire;
16use Crossfire::Client; 17use Crossfire::Client;
17use Crossfire::Protocol; 18use Crossfire::Protocol;
18 19
19use Client::Util; 20use Crossfire::Client::Util;
21use Crossfire::Client::Widget;
22
23our $FACECACHE;
20 24
21our $VERSION = '0.1'; 25our $VERSION = '0.1';
22 26
23our $CFG; 27our $CFG;
24our $CONN; 28our $CONN;
29
30our $UIFONT;
25 31
26our $SDL_TIMER; 32our $SDL_TIMER;
27our $SDL_APP; 33our $SDL_APP;
28our $SDL_EV = new SDL::Event; 34our $SDL_EV = new SDL::Event;
29our %SDL_CB; 35our %SDL_CB;
30 36
37our @GL_INIT; # hooks called on every gl init
38
31sub init_screen { 39sub init_screen {
32 # nuke all gl context data
33
34 $SDL_APP = new SDL::App 40 $SDL_APP = new SDL::App
35 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 41 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
36 -title => "Crossfire+ Client", 42 -title => "Crossfire+ Client",
37 -width => $CFG->{width}, 43 -width => $CFG->{width},
38 -height => $CFG->{height}, 44 -height => $CFG->{height},
… …
42 -blue_size => 8, 48 -blue_size => 8,
43 -double_buffer => 1, 49 -double_buffer => 1,
44 -fullscreen => $CFG->{fullscreen}, 50 -fullscreen => $CFG->{fullscreen},
45 -resizeable => 0; 51 -resizeable => 0;
46 52
53 $UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $CFG->{height} / 40
54 or die "TTFOpenFont: $!";
55
56 glClearColor 0, 0, 0, 0;
57
47 glEnable GL_TEXTURE_2D; 58 glEnable GL_TEXTURE_2D;
48 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
49 glShadeModel GL_FLAT; 59 glShadeModel GL_FLAT;
50 glDisable GL_DEPTH_TEST; 60 glDisable GL_DEPTH_TEST;
51 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 61 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
52 glEnable GL_BLEND;
53 62
54 glMatrixMode GL_PROJECTION; 63 glMatrixMode GL_PROJECTION;
55 glLoadIdentity; 64 glLoadIdentity;
56 glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1; 65 glOrtho 0, $CFG->{width}, $CFG->{height}, 0, -100 , 100;
57 66
58 # re-bind all textures 67 glMatrixMode GL_MODELVIEW;
68
69 $_->() for @GL_INIT;
59} 70}
71
72my $label;#d#
60 73
61sub start_game { 74sub start_game {
62 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 75 $SDL_TIMER = add Glib::Timeout 1000/20, sub {
63 while ($SDL_EV->poll) { 76 while ($SDL_EV->poll) {
64 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); 77 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->();
… …
67 1 80 1
68 }; 81 };
69 82
70 init_screen; 83 init_screen;
71 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
72 $CONN = new conn 101 $CONN = new conn
73 host => $CFG->{host}, 102 host => $CFG->{host},
74 port => $CFG->{port}; 103 port => $CFG->{port},
104 user => $CFG->{user},
105 pass => $CFG->{password};
75} 106}
76 107
77sub stop_game { 108sub stop_game {
78 remove Glib::Source $SDL_TIMER; 109 remove Glib::Source $SDL_TIMER;
79 110
80 undef $SDL_APP; 111 undef $SDL_APP;
81 SDL::Quit; 112 SDL::Quit;
82} 113}
83 114
84sub refresh { 115sub refresh {
85 glClearColor 0, 0, 0, 0;
86 glClear GL_COLOR_BUFFER_BIT; 116 glClear GL_COLOR_BUFFER_BIT;
87 117
88 my $map = $CONN->{map}; 118 $_->draw for @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 119
114 SDL::GLSwapBuffers; 120 SDL::GLSwapBuffers;
115} 121}
116 122
117%SDL_CB = ( 123%SDL_CB = (
118 SDL_QUIT() => sub { 124 SDL_QUIT() => sub {
119 warn "sdl quit\n";#d# 125 main_quit Gtk2;
120 exit;
121 }, 126 },
122 SDL_VIDEORESIZE() => sub { 127 SDL_VIDEORESIZE() => sub {
123 }, 128 },
124 SDL_VIDEOEXPOSE() => sub { 129 SDL_VIDEOEXPOSE() => sub {
125 refresh; 130 refresh;
126 }, 131 },
127 SDL_KEYDOWN() => sub { 132 SDL_KEYDOWN() => sub {
133 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
134 # alt-enter
135 $CFG->{fullscreen} = !$CFG->{fullscreen};
136 init_screen;
137 } else {
138 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
139 }
128 }, 140 },
129 SDL_KEYUP() => sub { 141 SDL_KEYUP() => sub {
142 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
130 }, 143 },
131 SDL_MOUSEMOTION() => sub { 144 SDL_MOUSEMOTION() => sub {
132 warn "sdl motion\n";#d# 145 warn "sdl motion\n";#d#
133 }, 146 },
134 SDL_MOUSEBUTTONDOWN() => sub { 147 SDL_MOUSEBUTTONDOWN() => sub {
148 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
135 }, 149 },
136 SDL_MOUSEBUTTONUP() => sub { 150 SDL_MOUSEBUTTONUP() => sub {
151 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
137 }, 152 },
138 SDL_ACTIVEEVENT() => sub { 153 SDL_ACTIVEEVENT() => sub {
139 warn "active\n";#d# 154 warn "active\n";#d#
140 }, 155 },
141); 156);
… …
158 my ($self) = @_; 173 my ($self) = @_;
159 174
160 refresh; 175 refresh;
161} 176}
162 177
178sub conn::face_find {
179 my ($self, $face) = @_;
180
181 $FACECACHE->{"$face->{chksum},$face->{name}"}
182}
183
163sub conn::face_update { 184sub conn::face_update {
164 my ($self, $num, $face) = @_; 185 my ($self, $face) = @_;
165 186
166 my $pb = new Gtk2::Gdk::PixbufLoader; 187 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
167 $pb->write ($face->{image});
168 $pb->close;
169 188
170 $pb = $pb->get_pixbuf; 189 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
171 $pb = $pb->add_alpha (0, 0, 0, 0); 190}
172 191
173 glGetError(); 192sub gtk_add_cfg_field {
174 my ($tex) = @{glGenTextures 1}; 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}
175 207
176 $face->{texture} = $tex; 208sub 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/],
177 218 );
178 glBindTexture GL_TEXTURE_2D, $tex; 219
179 my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr; 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;
180 244 }
181 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 245 });
182 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 246
183 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 247 $cfg->{_i} = 1;
184 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 248 for (@cfg) {
185 249 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
186 glTexImage2D GL_TEXTURE_2D, 0, 250 }
187 GL_RGBA8, 251
188 $pb->get_width, $pb->get_height, 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';
189 0, 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';
190 GL_RGBA, 266 }
191 GL_UNSIGNED_BYTE, 267 my $cb = $events{login} || sub {};
192 $pb->get_pixels; 268 $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; 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 });
194} 281}
282
195 283
196############################################################################# 284#############################################################################
197 285
286SDL::Init SDL_INIT_EVERYTHING;
287SDL::TTFInit;
288
289my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
290
291$mapwidget->activate;
292$mapwidget->focus_in;
293
198Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; 294Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
199 295
200$CFG ||= { 296$CFG ||= {
201 width => 640, 297 width => 640,
202 height => 480, 298 height => 480,
203 fullscreen => 0, 299 fullscreen => 0,
204 host => "crossfire.schmorp.de", 300 host => "crossfire.schmorp.de",
205 port => 13327, 301 port => 13327,
206}; 302};
207 303
208Client::Util::run_config_dialog; 304$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
305
306run_config_dialog
307 login => sub { start_game },
308 logout => sub { stop_game };
209 309
210main Gtk2; 310main Gtk2;
211 311
312Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

Diff Legend

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