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.39 by root, Sun Apr 9 00:09:50 2006 UTC vs.
Revision 1.57 by root, Sun Apr 9 23:11:16 2006 UTC

… …
32our $HEIGHT; 32our $HEIGHT;
33our $FULLSCREEN; 33our $FULLSCREEN;
34 34
35our $FONTSIZE; 35our $FONTSIZE;
36 36
37our ($FOCUS, $HOVER, $GRAB); # various widgets
38
37our $SDL_TIMER; 39our $SDL_TIMER;
38our $SDL_APP; 40our $SDL_APP;
39our $SDL_EV = new SDL::Event; 41our $SDL_EV = new SDL::Event;
40our %SDL_CB; 42our %SDL_CB;
41 43
42our @GL_INIT; # hooks called on every gl init 44our @GL_INIT; # hooks called on every gl init
43 45
44our $ALT_ENTER_MESSAGE; 46our $ALT_ENTER_MESSAGE;
47our $STATUS_LINE;
48
49our $TOPLEVEL;
45 50
46our $tw; # Test widget #d# 51our $tw; # Test widget #d#
52
53my $last_refresh;
54my %ANIMATE;
55my $refresh_handler;
47 56
48sub init_screen { 57sub init_screen {
49 $SDL_APP = new SDL::App 58 $SDL_APP = new SDL::App
50 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
51 -title => "Crossfire+ Client", 60 -title => "Crossfire+ Client",
52 -width => $WIDTH, 61 -width => $WIDTH,
53 -height => $HEIGHT, 62 -height => $HEIGHT,
54 -opengl => 1, 63 -opengl => 1,
55 -red_size => 8, 64 -red_size => 5,
56 -green_size => 8, 65 -green_size => 5,
57 -blue_size => 8, 66 -blue_size => 5,
67 -alpha_size => 0,
58 -double_buffer => 1, 68 -double_buffer => 1,
59 -fullscreen => $FULLSCREEN, 69 -fullscreen => $FULLSCREEN,
60 -resizeable => 0; 70 -resizeable => 0;
61 71
72 $last_refresh = SDL::GetTicks;
73
62 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 74 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
63 75
64 $GL_EXT{GL_ARB_texture_non_power_of_two} 76 $GL_EXT{GL_ARB_texture_non_power_of_two}
65 or warn "WARNING: non-power-of-two opengl extension required"; 77 or warn "WARNING: non-power-of-two opengl extension required";
66 78
67 $FONTSIZE = int $HEIGHT / 40; 79 $FONTSIZE = int $HEIGHT / 50;
68 80
69 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE, "Alt-Enter toggles fullscreen mode"; 81 #############################################################################
70 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
71 $ALT_ENTER_MESSAGE->activate;
72
73 # Test code #d#
74 {
75 my $frm = new Crossfire::Client::Widget::Frame;
76 $tw = new Crossfire::Client::Widget::Window;
77 $frm->add (new Crossfire::Client::Widget::Label 0, 0, 10, $FONTSIZE, "Foo in the garden!");
78 $tw->add ($frm);
79
80 $tw->move (0, $HEIGHT - 120);
81 $tw->activate;
82 }
83 82
84 glClearColor 0, 0, 0, 0; 83 glClearColor 0, 0, 0, 0;
85 84
86 glEnable GL_TEXTURE_2D; 85 glEnable GL_TEXTURE_2D;
87 glEnable GL_COLOR_MATERIAL; 86 glEnable GL_COLOR_MATERIAL;
88 glShadeModel GL_FLAT; 87 glShadeModel GL_FLAT;
89 glDisable GL_DEPTH_TEST; 88 glDisable GL_DEPTH_TEST;
90 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 89 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
91 90
92 $_->() for @GL_INIT; 91 $_->() for @GL_INIT;
92
93 #############################################################################
94
95 $STATUS_LINE = new Crossfire::Client::Widget::Label
96 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,
97 "";
98 $TOPLEVEL->add ($STATUS_LINE);
99
100 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
101 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,
102 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
103 $TOPLEVEL->add ($ALT_ENTER_MESSAGE);
104
105 # Test code #d#
106 unless ($tw) { # haha...
107 $tw = new Crossfire::Client::Widget::Animator;
108 my $lbl1 = new Crossfire::Client::Widget::Label
109 0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
110 my $lbl2 = new Crossfire::Client::Widget::Label
111 0, 0, 10, $FONTSIZE, "LBL2";
112
113 my $vb = new Crossfire::Client::Widget::VBox;
114 my $f = new Crossfire::Client::Widget::FancyFrame;
115 my $f2 = new Crossfire::Client::Widget::FancyFrame;
116 $f->add ($lbl1);
117 $f2->add ($lbl2);
118 $vb->add ($f);
119 $vb->add ($f2, 1);
120
121 $tw->add ($vb);
122 $tw->w (400);
123 $tw->h (300);
124 $tw->move ($WIDTH - 200, 0);
125 $tw->moveto (0, 0);
126 $TOPLEVEL->add ($tw);
127
128# $f->move ($WIDTH - 200, 0);
129# $TOPLEVEL->add ($f);
130 }
93} 131}
94 132
95sub start_game { 133sub start_game {
96 $SDL_TIMER = add Glib::Timeout 1000/100, sub { 134 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
97 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 135 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
98 while $SDL_EV->poll; 136 while $SDL_EV->poll;
99 137
100 1 138 1
101 }; 139 };
… …
103 $WIDTH = $CFG->{width}; 141 $WIDTH = $CFG->{width};
104 $HEIGHT = $CFG->{height}; 142 $HEIGHT = $CFG->{height};
105 $FULLSCREEN = 0; 143 $FULLSCREEN = 0;
106 144
107 init_screen; 145 init_screen;
146
147 my $mapsize = List::Util::min 64, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
108 148
109 $CONN = new conn 149 $CONN = new conn
110 host => $CFG->{host}, 150 host => $CFG->{host},
111 port => $CFG->{port}, 151 port => $CFG->{port},
112 user => $CFG->{user}, 152 user => $CFG->{user},
113 pass => $CFG->{password}, 153 pass => $CFG->{password},
114 mapw => 50, 154 mapw => $mapsize,
115 maph => 37, 155 maph => $mapsize,
116 ; 156 ;
157
158 Crossfire::Client::lowdelay fileno $CONN->{fh};
117} 159}
118 160
119sub stop_game { 161sub stop_game {
120 remove Glib::Source $SDL_TIMER; 162 remove Glib::Source $SDL_TIMER;
163 remove Glib::Source $refresh_handler if $refresh_handler;
164 undef $refresh_handler;
121 165
122 undef $SDL_APP; 166 undef $SDL_APP;
167 undef $CONN;
123 SDL::Quit; 168 SDL::Quit;
124} 169}
125 170
126 171
127sub force_refresh { 172sub force_refresh {
128 glViewport 0, 0, $WIDTH, $HEIGHT; 173 glViewport 0, 0, $WIDTH, $HEIGHT;
129 174
130 glMatrixMode GL_PROJECTION; 175 glMatrixMode GL_PROJECTION;
131 glLoadIdentity; 176 glLoadIdentity;
132 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100; 177 glOrtho 0, $WIDTH, $HEIGHT, 0, -6000 , 6000;
133 glMatrixMode GL_MODELVIEW; 178 glMatrixMode GL_MODELVIEW;
134 179
135 glClear GL_COLOR_BUFFER_BIT; 180 glClear GL_COLOR_BUFFER_BIT;
136 181
137 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS; 182 $TOPLEVEL->draw;
138 183
139 SDL::GLSwapBuffers; 184 SDL::GLSwapBuffers;
140} 185}
141
142my $refresh_handler;
143 186
144sub refresh { 187sub refresh {
145 $refresh_handler ||= add Glib::Idle sub { 188 $refresh_handler ||= add Glib::Idle sub {
189 return unless $SDL_APP;
190
191 my $next_refresh = SDL::GetTicks;
192 my $interval = ($next_refresh - $last_refresh) * 0.001;
193 $last_refresh = $next_refresh;
194
146 force_refresh; 195 force_refresh;
196 $_->animate ($interval) for grep $_, values %ANIMATE;
197
198 if (%ANIMATE) {
199 1
200 } else {
147 undef $refresh_handler; 201 undef $refresh_handler;
202 0
148 0 203 }
149 }; 204 };
205}
206
207sub animation_start {
208 my ($widget) = @_;
209 $ANIMATE{$widget} = $widget;
210 Scalar::Util::weaken $ANIMATE{$widget};
211
212 refresh;
213}
214
215sub animation_stop {
216 my ($widget) = @_;
217 delete $ANIMATE{$widget};
150} 218}
151 219
152%SDL_CB = ( 220%SDL_CB = (
153 SDL_QUIT() => sub { 221 SDL_QUIT() => sub {
154 main_quit Gtk2; 222 main_quit Gtk2;
… …
169 }, 237 },
170 SDL_KEYUP() => sub { 238 SDL_KEYUP() => sub {
171 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 239 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
172 }, 240 },
173 SDL_MOUSEMOTION() => sub { 241 SDL_MOUSEMOTION() => sub {
174 warn "sdl motion\n";#d# 242 my ($x, $y) = ($SDL_EV->motion_x, $SDL_EV->motion_y);
243 $HOVER = $GRAB || $TOPLEVEL->find_widget ($x, $y);
244 ::refresh;
175 }, 245 },
176 SDL_MOUSEBUTTONDOWN() => sub { 246 SDL_MOUSEBUTTONDOWN() => sub {
177 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 247 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
178 }, 248 },
179 SDL_MOUSEBUTTONUP() => sub { 249 SDL_MOUSEBUTTONUP() => sub {
… …
193} 263}
194 264
195sub conn::map_scroll { 265sub conn::map_scroll {
196 my ($self, $dx, $dy) = @_; 266 my ($self, $dx, $dy) = @_;
197 267
198 refresh; 268# refresh;
199} 269}
200 270
201sub conn::map_clear { 271sub conn::map_clear {
202 my ($self) = @_; 272 my ($self) = @_;
203 273
204 refresh; 274# refresh;
205} 275}
206 276
207sub conn::face_find { 277sub conn::face_find {
208 my ($self, $face) = @_; 278 my ($self, $face) = @_;
209 279
… …
235 } 305 }
236 $ent->set_text ($value); 306 $ent->set_text ($value);
237 $ent->signal_connect (changed => sub { 307 $ent->signal_connect (changed => sub {
238 my ($ent) = @_; 308 my ($ent) = @_;
239 $cfg->{$key} = $ent->get_text; 309 $cfg->{$key} = $ent->get_text;
310 # TODO: Mapsize should be a slider in the game gui
311 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
312 $cfg->{$key} = 100;
313 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
314 $cfg->{$key} = 50;
315 }
240 }); 316 });
241} 317}
242 318
243sub run_config_dialog { 319sub run_config_dialog {
244 my (%events) = @_; 320 my (%events) = @_;
… …
246 my $w = Gtk2::Window->new; 322 my $w = Gtk2::Window->new;
247 323
248 my @cfg = ( 324 my @cfg = (
249 [qw/Host host/], 325 [qw/Host host/],
250 [qw/Port port/], 326 [qw/Port port/],
327 [qw/Mapsize% mapsize/],
251 [qw/Username user/], 328 [qw/Username user/],
252 [qw/Password password/], 329 [qw/Password password/],
253 ); 330 );
254 331
255 my $cfg = {}; 332 my $cfg = {};
… …
302 my $cb = $events{login} || sub {}; 379 my $cb = $events{login} || sub {};
303 $cb->($::CFG->{user}, $::CFG->{password}); 380 $cb->($::CFG->{user}, $::CFG->{password});
304 }); 381 });
305 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5); 382 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
306 $cb->signal_connect (clicked => sub { 383 $cb->signal_connect (clicked => sub {
307 my $cb = $events{login} || sub {}; 384 my $cb = $events{logout} || sub {};
308 $cb->(); 385 $cb->();
309 }); 386 });
310 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5); 387 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
311 $cb->signal_connect (clicked => sub { $w->destroy }); 388 $cb->signal_connect (clicked => sub { $w->destroy });
312 389
… …
318 395
319############################################################################# 396#############################################################################
320 397
321SDL::Init SDL_INIT_EVERYTHING; 398SDL::Init SDL_INIT_EVERYTHING;
322 399
400$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new;
401
323my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 402my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
324 403
325$mapwidget->activate; 404$TOPLEVEL->add ($mapwidget);
326$mapwidget->focus_in; 405$mapwidget->focus_in;
327 406
328Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 407Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
329 408
330$CFG ||= { 409$CFG ||= {
331 width => 640, 410 width => 640,
332 height => 480, 411 height => 480,
412 mapsize => 100,
333 fullscreen => 0, 413 fullscreen => 0,
334 host => "crossfire.schmorp.de", 414 host => "crossfire.schmorp.de",
335 port => 13327, 415 port => 13327,
336}; 416};
337 417
418Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf";
419
338$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 420$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
339 421
340run_config_dialog 422run_config_dialog
341 login => sub { start_game }, 423 login => sub { start_game },
342 logout => sub { stop_game }; 424 logout => sub { stop_game };

Diff Legend

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