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.20 by elmex, Fri Apr 7 19:58:55 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
2use strict; 3use strict;
4use utf8;
3 5
4use Glib; 6use Glib;
5use Gtk2 -init; 7use Gtk2 -init;
6 8
7use SDL; 9use SDL;
… …
22 24
23our $VERSION = '0.1'; 25our $VERSION = '0.1';
24 26
25our $CFG; 27our $CFG;
26our $CONN; 28our $CONN;
29
30our $UIFONT;
27 31
28our $SDL_TIMER; 32our $SDL_TIMER;
29our $SDL_APP; 33our $SDL_APP;
30our $SDL_EV = new SDL::Event; 34our $SDL_EV = new SDL::Event;
31our %SDL_CB; 35our %SDL_CB;
… …
44 -blue_size => 8, 48 -blue_size => 8,
45 -double_buffer => 1, 49 -double_buffer => 1,
46 -fullscreen => $CFG->{fullscreen}, 50 -fullscreen => $CFG->{fullscreen},
47 -resizeable => 0; 51 -resizeable => 0;
48 52
53 $UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $CFG->{height} / 40
54 or die "TTFOpenFont: $!";
55
49 glClearColor 0, 0, 0, 0; 56 glClearColor 0, 0, 0, 0;
50 57
51 glEnable GL_TEXTURE_2D; 58 glEnable GL_TEXTURE_2D;
52 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
53 glShadeModel GL_FLAT; 59 glShadeModel GL_FLAT;
54 glDisable GL_DEPTH_TEST; 60 glDisable GL_DEPTH_TEST;
55 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 61 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
56 glEnable GL_BLEND;
57 62
58 glMatrixMode GL_PROJECTION; 63 glMatrixMode GL_PROJECTION;
59 glLoadIdentity; 64 glLoadIdentity;
60 glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -100 , 100; 65 glOrtho 0, $CFG->{width}, $CFG->{height}, 0, -100 , 100;
61 66
62 glMatrixMode GL_MODELVIEW; 67 glMatrixMode GL_MODELVIEW;
63 68
64 $_->() for @GL_INIT; 69 $_->() for @GL_INIT;
65} 70}
71
72my $label;#d#
66 73
67sub start_game { 74sub start_game {
68 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 75 $SDL_TIMER = add Glib::Timeout 1000/20, sub {
69 while ($SDL_EV->poll) { 76 while ($SDL_EV->poll) {
70 ($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 })->();
… …
73 1 80 1
74 }; 81 };
75 82
76 init_screen; 83 init_screen;
77 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
78 $CONN = new conn 101 $CONN = new conn
79 host => $CFG->{host}, 102 host => $CFG->{host},
80 port => $CFG->{port}; 103 port => $CFG->{port},
104 user => $CFG->{user},
105 pass => $CFG->{password};
81} 106}
82 107
83sub stop_game { 108sub stop_game {
84 remove Glib::Source $SDL_TIMER; 109 remove Glib::Source $SDL_TIMER;
85 110
… …
88} 113}
89 114
90sub refresh { 115sub refresh {
91 glClear GL_COLOR_BUFFER_BIT; 116 glClear GL_COLOR_BUFFER_BIT;
92 117
93 for (values %Client::Widget::ACTIVE_WIDGETS) { 118 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;
94 $_->draw
95 }
96 119
97 SDL::GLSwapBuffers; 120 SDL::GLSwapBuffers;
98} 121}
99 122
100%SDL_CB = ( 123%SDL_CB = (
101 SDL_QUIT() => sub { 124 SDL_QUIT() => sub {
102 warn "sdl quit\n";#d#
103 main_quit Gtk2; 125 main_quit Gtk2;
104 }, 126 },
105 SDL_VIDEORESIZE() => sub { 127 SDL_VIDEORESIZE() => sub {
106 }, 128 },
107 SDL_VIDEOEXPOSE() => sub { 129 SDL_VIDEOEXPOSE() => sub {
… …
111 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 133 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
112 # alt-enter 134 # alt-enter
113 $CFG->{fullscreen} = !$CFG->{fullscreen}; 135 $CFG->{fullscreen} = !$CFG->{fullscreen};
114 init_screen; 136 init_screen;
115 } else { 137 } else {
116 Client::Widget::feed_sdl_key_down_event ($SDL_EV); 138 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
117 } 139 }
118 }, 140 },
119 SDL_KEYUP() => sub { 141 SDL_KEYUP() => sub {
120 Client::Widget::feed_sdl_key_up_event ($SDL_EV); 142 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
121 }, 143 },
122 SDL_MOUSEMOTION() => sub { 144 SDL_MOUSEMOTION() => sub {
123 warn "sdl motion\n";#d# 145 warn "sdl motion\n";#d#
124 }, 146 },
125 SDL_MOUSEBUTTONDOWN() => sub { 147 SDL_MOUSEBUTTONDOWN() => sub {
126 Client::Widget::feed_sdl_button_down_event ($SDL_EV); 148 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
127 }, 149 },
128 SDL_MOUSEBUTTONUP() => sub { 150 SDL_MOUSEBUTTONUP() => sub {
129 Client::Widget::feed_sdl_button_up_event ($SDL_EV); 151 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
130 }, 152 },
131 SDL_ACTIVEEVENT() => sub { 153 SDL_ACTIVEEVENT() => sub {
132 warn "active\n";#d# 154 warn "active\n";#d#
133 }, 155 },
134); 156);
… …
165 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 187 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
166 188
167 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 189 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
168} 190}
169 191
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}
207
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/],
218 );
219
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;
244 }
245 });
246
247 $cfg->{_i} = 1;
248 for (@cfg) {
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';
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';
266 }
267 my $cb = $events{login} || sub {};
268 $cb->($::CFG->{user}, $::CFG->{password});
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 });
281}
282
283
170############################################################################# 284#############################################################################
171 285
172SDL::Init(SDL_INIT_EVERYTHING()); 286SDL::Init SDL_INIT_EVERYTHING;
287SDL::TTFInit;
173 288
174my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 289my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
175
176#find_rcfile "uifont.ttf";
177 290
178$mapwidget->activate; 291$mapwidget->activate;
179$mapwidget->focus_in; 292$mapwidget->focus_in;
180 293
181read_cfg "$Crossfire::VARDIR/pclientrc"; 294Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
182
183$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
184 295
185$CFG ||= { 296$CFG ||= {
186 width => 640, 297 width => 640,
187 height => 480, 298 height => 480,
188 fullscreen => 0, 299 fullscreen => 0,
189 host => "crossfire.schmorp.de", 300 host => "crossfire.schmorp.de",
190 port => 13327, 301 port => 13327,
191}; 302};
192 303
193Crossfire::Client::Util::run_config_dialog 304$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
305
306run_config_dialog
194 login => sub { start_game }, 307 login => sub { start_game },
195 logout => sub { stop_game }; 308 logout => sub { stop_game };
196 309
197main Gtk2; 310main Gtk2;
198 311

Diff Legend

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