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.33 by root, Sat Apr 8 18:15:59 2006 UTC vs.
Revision 1.53 by root, Sun Apr 9 22:17:40 2006 UTC

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

Diff Legend

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