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.54 by root, Sun Apr 9 22:24:43 2006 UTC vs.
Revision 1.59 by root, Mon Apr 10 11:55:16 2006 UTC

… …
12use SDL::Surface; 12use SDL::Surface;
13use SDL::OpenGL; 13use SDL::OpenGL;
14use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Protocol;
18
17use Crossfire::Client; 19use Crossfire::Client;
18use Crossfire::Protocol;
19
20use Crossfire::Client::Widget; 20use Crossfire::Client::Widget;
21 21
22our $FACECACHE; 22our $FACECACHE;
23 23
24our $VERSION = '0.1'; 24our $VERSION = '0.1';
… …
31our $WIDTH; 31our $WIDTH;
32our $HEIGHT; 32our $HEIGHT;
33our $FULLSCREEN; 33our $FULLSCREEN;
34 34
35our $FONTSIZE; 35our $FONTSIZE;
36our $FOCUS;
37our $HOVER;
38 36
39our $SDL_TIMER; 37our $SDL_TIMER;
40our $SDL_APP; 38our $SDL_APP;
41our $SDL_EV = new SDL::Event; 39our $SDL_EV;
42our %SDL_CB; 40our %SDL_CB;
43 41
44our @GL_INIT; # hooks called on every gl init 42our @GL_INIT; # hooks called on every gl init
45 43
46our $ALT_ENTER_MESSAGE; 44our $ALT_ENTER_MESSAGE;
47our $STATUS_LINE; 45our $STATUS_LINE;
48
49our $TOPLEVEL;
50
51our $tw; # Test widget #d#
52 46
53my $last_refresh; 47my $last_refresh;
54my %ANIMATE; 48my %ANIMATE;
55my $refresh_handler; 49my $refresh_handler;
50
51our ($tw, $te); # Test widget #d#
56 52
57sub init_screen { 53sub init_screen {
58 $SDL_APP = new SDL::App 54 $SDL_APP = new SDL::App
59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 55 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
60 -title => "Crossfire+ Client", 56 -title => "Crossfire+ Client",
… …
67 -alpha_size => 0, 63 -alpha_size => 0,
68 -double_buffer => 1, 64 -double_buffer => 1,
69 -fullscreen => $FULLSCREEN, 65 -fullscreen => $FULLSCREEN,
70 -resizeable => 0; 66 -resizeable => 0;
71 67
68 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1);
70
72 $last_refresh = SDL::GetTicks; 71 $last_refresh = SDL::GetTicks;
73 72
74 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 73 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
75 74
76 $GL_EXT{GL_ARB_texture_non_power_of_two} 75 $GL_EXT{GL_ARB_texture_non_power_of_two}
… …
78 77
79 $FONTSIZE = int $HEIGHT / 50; 78 $FONTSIZE = int $HEIGHT / 50;
80 79
81 ############################################################################# 80 #############################################################################
82 81
83 glClearColor 0, 0, 0, 0; 82 glClearColor 1, 1, 1, 1;
84 83
85 glEnable GL_TEXTURE_2D; 84 glEnable GL_TEXTURE_2D;
86 glEnable GL_COLOR_MATERIAL; 85 glEnable GL_COLOR_MATERIAL;
87 glShadeModel GL_FLAT; 86 glShadeModel GL_FLAT;
88 glDisable GL_DEPTH_TEST; 87 glDisable GL_DEPTH_TEST;
… …
93 ############################################################################# 92 #############################################################################
94 93
95 $STATUS_LINE = new Crossfire::Client::Widget::Label 94 $STATUS_LINE = new Crossfire::Client::Widget::Label
96 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE, 95 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,
97 ""; 96 "";
98 $TOPLEVEL->add ($STATUS_LINE); 97 $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE);
99 98
100 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 99 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
101 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60, 100 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,
102 "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 101 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
103 $TOPLEVEL->add ($ALT_ENTER_MESSAGE); 102 $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
104 103
105 # Test code #d# 104 # Test code #d#
106 unless ($tw) { # haha... 105 unless ($tw) { # haha...
106 $te = new Crossfire::Client::Widget::FancyFrame;
107 $te->add (new Crossfire::Client::Widget::Entry);
108 $te->move (300, 0, 2);
109 $Crossfire::Client::Widget::TOPLEVEL->add ($te);
110
107 $tw = new Crossfire::Client::Widget::Animator; 111 $tw = new Crossfire::Client::Widget::Animator;
108 my $lbl1 = new Crossfire::Client::Widget::Label 112 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!"; 113 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 114 my $lbl2 = new Crossfire::Client::Widget::Label
111 0, 0, 10, $FONTSIZE, "LBL2"; 115 0, 0, 10, $FONTSIZE, "LBL2";
… …
121 $tw->add ($vb); 125 $tw->add ($vb);
122 $tw->w (400); 126 $tw->w (400);
123 $tw->h (300); 127 $tw->h (300);
124 $tw->move ($WIDTH - 200, 0); 128 $tw->move ($WIDTH - 200, 0);
125 $tw->moveto (0, 0); 129 $tw->moveto (0, 0);
126 $TOPLEVEL->add ($tw); 130 $Crossfire::Client::Widget::TOPLEVEL->add ($tw);
127 131
128# $f->move ($WIDTH - 200, 0); 132# $f->move ($WIDTH - 200, 0);
129# $TOPLEVEL->add ($f); 133# $Crossfire::Client::Widget::TOPLEVEL->add ($f);
130 } 134 }
131} 135}
132 136
133sub start_game { 137sub start_game {
134 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 138 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
… …
142 $HEIGHT = $CFG->{height}; 146 $HEIGHT = $CFG->{height};
143 $FULLSCREEN = 0; 147 $FULLSCREEN = 0;
144 148
145 init_screen; 149 init_screen;
146 150
147 my $mapsize = List::Util::min 64, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32; 151 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
148 152
149 $CONN = new conn 153 $CONN = new conn
150 host => $CFG->{host}, 154 host => $CFG->{host},
151 port => $CFG->{port}, 155 port => $CFG->{port},
152 user => $CFG->{user}, 156 user => $CFG->{user},
… …
166 undef $SDL_APP; 170 undef $SDL_APP;
167 undef $CONN; 171 undef $CONN;
168 SDL::Quit; 172 SDL::Quit;
169} 173}
170 174
171
172sub force_refresh { 175sub force_refresh {
173 glViewport 0, 0, $WIDTH, $HEIGHT; 176 glViewport 0, 0, $WIDTH, $HEIGHT;
174 177
175 glMatrixMode GL_PROJECTION; 178 glMatrixMode GL_PROJECTION;
176 glLoadIdentity; 179 glLoadIdentity;
177 glOrtho 0, $WIDTH, $HEIGHT, 0, -6000 , 6000; 180 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
178 glMatrixMode GL_MODELVIEW; 181 glMatrixMode GL_MODELVIEW;
179 182
180 glClear GL_COLOR_BUFFER_BIT; 183 glClear GL_COLOR_BUFFER_BIT;
181 184
182 $TOPLEVEL->draw; 185 $Crossfire::Client::Widget::TOPLEVEL->draw;
183 186
184 SDL::GLSwapBuffers; 187 SDL::GLSwapBuffers;
185} 188}
186 189
187sub refresh { 190sub refresh {
188 $refresh_handler ||= add Glib::Idle sub { 191 $refresh_handler ||= add Glib::Idle sub {
189 return unless $SDL_APP; 192 if ($SDL_APP) {
190
191 my $next_refresh = SDL::GetTicks; 193 my $next_refresh = SDL::GetTicks;
192 my $interval = ($next_refresh - $last_refresh) * 0.001; 194 my $interval = ($next_refresh - $last_refresh) * 0.001;
193 $last_refresh = $next_refresh; 195 $last_refresh = $next_refresh;
194 196
195 force_refresh; 197 force_refresh;
196 $_->animate ($interval) for grep $_, values %ANIMATE; 198 $_->animate ($interval) for grep $_, values %ANIMATE;
197 199
198 if (%ANIMATE) { 200 if (%ANIMATE) {
201 1
202 } else {
203 undef $refresh_handler;
204 0
199 1 205 }
200 } else { 206 } else {
201 undef $refresh_handler; 207 undef $refresh_handler;
202 0 208 0
203 } 209 }
204 }; 210 };
… …
237 }, 243 },
238 SDL_KEYUP() => sub { 244 SDL_KEYUP() => sub {
239 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 245 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
240 }, 246 },
241 SDL_MOUSEMOTION() => sub { 247 SDL_MOUSEMOTION() => sub {
242 my ($x, $y) = ($SDL_EV->motion_x, $SDL_EV->motion_y); 248 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV);
243 $HOVER = $TOPLEVEL->find_widget ($x, $y);
244
245 warn "mouse $x, $y = $HOVER\n";
246 }, 249 },
247 SDL_MOUSEBUTTONDOWN() => sub { 250 SDL_MOUSEBUTTONDOWN() => sub {
248 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 251 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
249 }, 252 },
250 SDL_MOUSEBUTTONUP() => sub { 253 SDL_MOUSEBUTTONUP() => sub {
251 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 254 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
252 }, 255 },
253 SDL_ACTIVEEVENT() => sub { 256 SDL_ACTIVEEVENT() => sub {
254 warn "active\n";#d# 257 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
255 }, 258 },
256); 259);
257 260
258@conn::ISA = Crossfire::Protocol::; 261@conn::ISA = Crossfire::Protocol::;
259 262
… …
396 399
397############################################################################# 400#############################################################################
398 401
399SDL::Init SDL_INIT_EVERYTHING; 402SDL::Init SDL_INIT_EVERYTHING;
400 403
401$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new;
402
403my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 404my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
404 405
405$TOPLEVEL->add ($mapwidget); 406$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
406$mapwidget->focus_in; 407$mapwidget->focus_in;
407 408
408Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 409Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
409 410
410$CFG ||= { 411$CFG ||= {

Diff Legend

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