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.18 by root, Fri Apr 7 18:49:53 2006 UTC vs.
Revision 1.27 by root, Fri Apr 7 21:07:29 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; 20use Crossfire::Client::Util;
19use Client::Widget; 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;
… …
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;
66
67 glMatrixMode GL_MODELVIEW;
57 68
58 $_->() for @GL_INIT; 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 $label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "Testü[]";
86 $label->activate;
87
72 $CONN = new conn 88 $CONN = new conn
73 host => $CFG->{host}, 89 host => $CFG->{host},
74 port => $CFG->{port}; 90 port => $CFG->{port};
75} 91}
76 92
… …
80 undef $SDL_APP; 96 undef $SDL_APP;
81 SDL::Quit; 97 SDL::Quit;
82} 98}
83 99
84sub refresh { 100sub refresh {
85 glClearColor 0, 0, 0, 0;
86 glClear GL_COLOR_BUFFER_BIT; 101 glClear GL_COLOR_BUFFER_BIT;
87 102
88 for (values %Client::Widget::ACTIVE_WIDGETS) { 103 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;
89 $_->draw
90 }
91 104
92 SDL::GLSwapBuffers; 105 SDL::GLSwapBuffers;
93} 106}
94 107
95%SDL_CB = ( 108%SDL_CB = (
96 SDL_QUIT() => sub { 109 SDL_QUIT() => sub {
97 warn "sdl quit\n";#d# 110 main_quit Gtk2;
98 exit;
99 }, 111 },
100 SDL_VIDEORESIZE() => sub { 112 SDL_VIDEORESIZE() => sub {
101 }, 113 },
102 SDL_VIDEOEXPOSE() => sub { 114 SDL_VIDEOEXPOSE() => sub {
103 refresh; 115 refresh;
… …
106 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 118 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
107 # alt-enter 119 # alt-enter
108 $CFG->{fullscreen} = !$CFG->{fullscreen}; 120 $CFG->{fullscreen} = !$CFG->{fullscreen};
109 init_screen; 121 init_screen;
110 } else { 122 } else {
111 Client::Widget::feed_sdl_key_down_event ($SDL_EV); 123 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
112 } 124 }
113 }, 125 },
114 SDL_KEYUP() => sub { 126 SDL_KEYUP() => sub {
115 Client::Widget::feed_sdl_key_up_event ($SDL_EV); 127 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
116 }, 128 },
117 SDL_MOUSEMOTION() => sub { 129 SDL_MOUSEMOTION() => sub {
118 warn "sdl motion\n";#d# 130 warn "sdl motion\n";#d#
119 }, 131 },
120 SDL_MOUSEBUTTONDOWN() => sub { 132 SDL_MOUSEBUTTONDOWN() => sub {
121 Client::Widget::feed_sdl_button_down_event ($SDL_EV); 133 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
122 }, 134 },
123 SDL_MOUSEBUTTONUP() => sub { 135 SDL_MOUSEBUTTONUP() => sub {
124 Client::Widget::feed_sdl_button_up_event ($SDL_EV); 136 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
125 }, 137 },
126 SDL_ACTIVEEVENT() => sub { 138 SDL_ACTIVEEVENT() => sub {
127 warn "active\n";#d# 139 warn "active\n";#d#
128 }, 140 },
129); 141);
… …
146 my ($self) = @_; 158 my ($self) = @_;
147 159
148 refresh; 160 refresh;
149} 161}
150 162
163sub conn::face_find {
164 my ($self, $face) = @_;
165
166 $FACECACHE->{"$face->{chksum},$face->{name}"}
167}
168
151sub conn::face_update { 169sub conn::face_update {
152 my ($self, $num, $face) = @_; 170 my ($self, $face) = @_;
171
172 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
153 173
154 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 174 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
155} 175}
156 176
177sub gtk_add_cfg_field {
178 my ($tbl, $cfg, $klbl, $key, $value) = @_;
179 my $i = $cfg->{_i}++;
180 $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
181 $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
182 if ($key eq 'password') {
183 $ent->set_invisible_char ("*");
184 $ent->set (visibility => 0)
185 }
186 $ent->set_text ($value);
187 $ent->signal_connect (changed => sub {
188 my ($ent) = @_;
189 $cfg->{$key} = $ent->get_text;
190 });
191}
192
193sub run_config_dialog {
194 my (%events) = @_;
195
196 my $w = Gtk2::Window->new;
197
198 my @cfg = (
199 [qw/Host host/],
200 [qw/Port port/],
201 [qw/Username user/],
202 [qw/Password password/],
203 );
204
205 my $cfg = {};
206
207 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
208 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
209
210 $w->add (my $vb = Gtk2::VBox->new);
211 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
212 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
213 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
214 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
215 my $i = 0;
216 my $act = 0;
217 for (map { "$_->[0]x$_->[1]" } reverse @modes) {
218 if ($_ eq $selmode) { $act = $i }
219 $cb->append_text ($_);
220 $i++;
221 }
222 $cb->set_active ($act);
223 $cb->signal_connect (changed => sub {
224 my ($cb) = @_;
225 my $txt = $cb->get_active_text;
226 if ($txt =~ m/(\d+)x(\d+)/) {
227 $::CFG->{width} = $1;
228 $::CFG->{height} = $2;
229 }
230 });
231
232 $cfg->{_i} = 1;
233 for (@cfg) {
234 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
235 }
236
237 $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
238 $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
239 $cb->signal_connect (clicked => sub {
240 for (keys %$cfg) {
241 $::CFG->{$_} = $cfg->{$_}
242 if $_ ne '_i';
243 }
244 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
245 });
246 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
247 $cb->signal_connect (clicked => sub {
248 for (keys %$cfg) {
249 $::CFG->{$_} = $cfg->{$_}
250 if $_ ne '_i';
251 }
252 my $cb = $events{login} || sub {};
253 $cb->($::CFG->{user}, $::CFG->{password});
254 });
255 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
256 $cb->signal_connect (clicked => sub {
257 my $cb = $events{login} || sub {};
258 $cb->();
259 });
260 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
261 $cb->signal_connect (clicked => sub { $w->destroy });
262
263 $w->show_all;
264
265 $w->signal_connect (destroy => sub { Gtk2->main_quit });
266}
267
268
157############################################################################# 269#############################################################################
158 270
271SDL::Init SDL_INIT_EVERYTHING;
272SDL::TTFInit;
273
159my $mapwidget = Client::MapWidget->new; 274my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
160 275
161$mapwidget->activate; 276$mapwidget->activate;
162$mapwidget->focus_in; 277$mapwidget->focus_in;
163 278
164Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; 279Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
165 280
166$CFG ||= { 281$CFG ||= {
167 width => 640, 282 width => 640,
168 height => 480, 283 height => 480,
169 fullscreen => 0, 284 fullscreen => 0,
170 host => "crossfire.schmorp.de", 285 host => "crossfire.schmorp.de",
171 port => 13327, 286 port => 13327,
172}; 287};
173 288
174Client::Util::run_config_dialog 289$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
290
291run_config_dialog
175 login => sub { start_game }, 292 login => sub { start_game },
176 logout => sub { stop_game }; 293 logout => sub { stop_game };
177 294
178main Gtk2; 295main Gtk2;
296
297Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

Diff Legend

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