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

Diff Legend

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