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

Diff Legend

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