ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.45 by root, Sun Apr 9 22:19:03 2006 UTC vs.
Revision 1.69 by root, Tue Apr 11 17:32:14 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11 11
12our $FOCUS; # the widget with current focus 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
13 16
14# class methods for events 17# class methods for events
15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
17sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
18sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
19 74
20sub new { 75sub new {
21 my $class = shift; 76 my $class = shift;
22 77
23 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
24} 84}
25 85
26sub move { 86sub move {
27 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
28 $self->{x} = $x; 88 $self->{x} = $x;
… …
44 104
45 $self->{w} = $w; 105 $self->{w} = $w;
46 $self->{h} = $h; 106 $self->{h} = $h;
47} 107}
48 108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114}
115
49sub focus_in { 116sub focus_in {
50 my ($widget) = @_; 117 my ($self) = @_;
51 $FOCUS = $widget; 118
119 return if $FOCUS == $self;
120
121 my $focus = $FOCUS; $FOCUS = $self;
122 $focus->update if $focus;
123 $FOCUS->update;
52} 124}
53 125
54sub focus_out { 126sub focus_out {
55 my ($widget) = @_; 127 my ($self) = @_;
56}
57 128
129 return unless $FOCUS == $self;
130
131 my $focus = $FOCUS; undef $FOCUS;
132 $focus->update if $focus; #?
133}
134
135sub mouse_motion { }
136sub button_up { }
58sub key_down { 137sub key_down { }
59 my ($widget, $sdlev) = @_;
60}
61
62sub key_up { 138sub key_up { }
63 my ($widget, $sdlev) = @_;
64}
65 139
66sub button_down { 140sub button_down {
67 my ($widget, $sdlev) = @_; 141 my ($self, $ev, $x, $y) = @_;
68}
69 142
70sub button_up { 143 $self->focus_in;
71 my ($widget, $sdlev) = @_;
72} 144}
73 145
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79 151
80sub draw { 152sub draw {
81 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
82 156
83 glPushMatrix; 157 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw; 159 $self->_draw;
160 if ($self == $HOVER) {
161 glColor 1, 1, 1, 0.4;
162 glEnable GL_BLEND;
163 glBegin GL_QUADS;
164 glVertex 0 , 0;
165 glVertex $self->{w}, 0;
166 glVertex $self->{w}, $self->{h};
167 glVertex 0 , $self->{h};
168 glEnd;
169 glDisable GL_BLEND;
170 }
86 glPopMatrix; 171 glPopMatrix;
87} 172}
88 173
89sub _draw { 174sub _draw {
90 my ($self) = @_; 175 my ($self) = @_;
… …
139 #$self->deactivate; 224 #$self->deactivate;
140} 225}
141 226
142############################################################################# 227#############################################################################
143 228
144package Crossfire::Client::Widget::Container; 229package CFClient::Widget::DrawBG;
145 230
146our @ISA = Crossfire::Client::Widget::; 231our @ISA = CFClient::Widget::;
232
233use strict;
234use SDL::OpenGL;
147 235
148sub new { 236sub new {
237 my $class = shift;
238
239 # range [value, low, high, page]
240
241 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4],
243 active_bg => [1, 1, 1],
244 @_
245 )
246}
247
248sub _draw {
249 my ($self) = @_;
250
251 my ($w, $h) = @$self{qw(w h)};
252
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
254 glBegin GL_QUADS;
255 glVertex 0 , 0;
256 glVertex 0 , $h;
257 glVertex $w, $h;
258 glVertex $w, 0;
259 glEnd;
260}
261
262#############################################################################
263
264package CFClient::Widget::Empty;
265
266our @ISA = CFClient::Widget::;
267
268sub size_request {
269 (0, 0)
270}
271
272sub draw { }
273
274#############################################################################
275
276package CFClient::Widget::Container;
277
278our @ISA = CFClient::Widget::;
279
280sub new {
149 my ($class, @widgets) = @_; 281 my ($class, %arg) = @_;
150 282
283 my $children = delete $arg{children} || [];
284
151 my $self = $class->SUPER::new (children => []); 285 my $self = $class->SUPER::new (children => [], %arg);
152 $self->add ($_) for @widgets; 286 $self->add ($_) for @$children;
153 287
154 $self 288 $self
155} 289}
156 290
157sub add { 291sub add {
158 my ($self, $chld, $expand) = @_; 292 my ($self, $chld, $expand) = @_;
159 293
160 $chld->{expand} = $expand; 294 $chld->{expand} = $expand;
161 $chld->set_parent ($self); 295 $chld->set_parent ($self);
162 296
163 @{$self->{children}} = 297 $self->{children} = [
164 sort { $a->{z} <=> $b->{z} } 298 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld; 299 @{$self->{children}}, $chld
300 ];
166 301
167 $self->size_allocate ($self->{w}, $self->{h}) 302 $self->size_allocate ($self->{w}, $self->{h})
168 if $self->{w}; #TODO: check for "realised state" 303 if $self->{w}; #TODO: check for "realised state"
169} 304}
170 305
… …
182 $x -= $self->{x}; 317 $x -= $self->{x};
183 $y -= $self->{y}; 318 $y -= $self->{y};
184 319
185 my $res; 320 my $res;
186 321
187 for (@{ $self->{children} }) { 322 for (reverse @{ $self->{children} }) {
188 $res = $_->find_widget ($x, $y) 323 $res = $_->find_widget ($x, $y)
189 and return $res; 324 and return $res;
190 } 325 }
191 326
192 () 327 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
193} 328}
194 329
195sub _draw { 330sub _draw {
196 my ($self) = @_; 331 my ($self) = @_;
197 332
198 $_->draw for @{$self->{children}}; 333 $_->draw for @{$self->{children}};
199} 334}
200 335
201############################################################################# 336#############################################################################
202 337
203package Crossfire::Client::Widget::Bin; 338package CFClient::Widget::Bin;
204 339
205our @ISA = Crossfire::Client::Widget::Container::; 340our @ISA = CFClient::Widget::Container::;
341
342sub new {
343 my ($class, %arg) = @_;
344
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
346
347 $class->SUPER::new (children => [$child], %arg)
348}
349
350sub add {
351 my ($self, $widget) = @_;
352
353 $self->{children} = [];
354
355 $self->SUPER::add ($widget);
356}
357
358sub remove {
359 my ($self, $widget) = @_;
360
361 $self->SUPER::remove ($widget);
362
363 $self->{children} = [new CFClient::Widget::Empty]
364 unless @{$self->{children}};
365}
206 366
207sub child { $_[0]->{children}[0] } 367sub child { $_[0]->{children}[0] }
208 368
209sub size_request { 369sub size_request {
210 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 370 $_[0]{children}[0]->size_request
211} 371}
212 372
213sub size_allocate { 373sub size_allocate {
214 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
215 375
376 return unless $self->{w} != $w || $self->{h} != $h;
377
216 $self->SUPER::size_allocate ($w, $h); 378 $self->SUPER::size_allocate ($w, $h);
217 $self->{children}[0]->size_allocate ($w, $h) 379 $self->{children}[0]->size_allocate ($w, $h);
218 if $self->{children}[0]
219} 380}
220 381
221############################################################################# 382#############################################################################
222 383
223package Crossfire::Client::Widget::Toplevel; 384package CFClient::Widget::Window;
224 385
225our @ISA = Crossfire::Client::Widget::Container::; 386our @ISA = CFClient::Widget::Bin::;
387
388use SDL::OpenGL;
389
390sub new {
391 my ($class, %arg) = @_;
392
393 my $self = $class->SUPER::new (%arg);
394}
226 395
227sub update { 396sub update {
228 my ($self) = @_; 397 my ($self) = @_;
229 398
230 ::refresh (); 399 # we want to do this delayed...
231}
232
233sub add {
234 my ($self, $widget) = @_;
235
236 $self->SUPER::add ($widget);
237
238 $widget->size_allocate ($widget->size_request);
239}
240
241#############################################################################
242
243package Crossfire::Client::Widget::Window;
244
245our @ISA = Crossfire::Client::Widget::Bin::;
246
247use SDL::OpenGL;
248
249sub new {
250 my ($class, $x, $y, $z, $w, $h) = @_;
251
252 my $self = $class->SUPER::new;
253
254 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
255}
256
257sub update {
258 my ($self) = @_;
259
260 $self->render_chld; 400 $self->render_chld;
261 $self->SUPER::update; 401 $self->SUPER::update;
262} 402}
263 403
264sub render_chld { 404sub render_chld {
265 my ($self) = @_; 405 my ($self) = @_;
266 406
267 $self->{texture} = 407 $self->{texture} =
268 Crossfire::Client::Texture->new_from_opengl ( 408 CFClient::Texture->new_from_opengl (
269 $self->{w}, $self->{h}, sub { $self->child->draw } 409 $self->{w}, $self->{h}, sub { $self->child->draw }
270 ); 410 );
271} 411}
272 412
273sub size_allocate { 413sub size_allocate {
274 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
415
416 return unless $self->{w} != $w || $self->{h} != $h;
275 417
276 $self->{w} = $w; 418 $self->{w} = $w;
277 $self->{h} = $h; 419 $self->{h} = $h;
278 420
279 $self->child->size_allocate ($w, $h); 421 $self->child->size_allocate ($w, $h);
… …
290 or return; 432 or return;
291 433
292 glEnable GL_BLEND; 434 glEnable GL_BLEND;
293 glEnable GL_TEXTURE_2D; 435 glEnable GL_TEXTURE_2D;
294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
295 glBindTexture GL_TEXTURE_2D, $tex->{name};
296 437
297 glBegin GL_QUADS; 438 $tex->draw_quad (0, 0, $w, $h);
298 glTexCoord 0, 0; glVertex 0, 0;
299 glTexCoord 0, 1; glVertex 0, $h;
300 glTexCoord 1, 1; glVertex $w, $h;
301 glTexCoord 1, 0; glVertex $w, 0;
302 glEnd;
303 439
304 glDisable GL_BLEND; 440 glDisable GL_BLEND;
305 glDisable GL_TEXTURE_2D; 441 glDisable GL_TEXTURE_2D;
306} 442}
307 443
308############################################################################# 444#############################################################################
309 445
310package Crossfire::Client::Widget::Frame; 446package CFClient::Widget::Frame;
311 447
312our @ISA = Crossfire::Client::Widget::Bin::; 448our @ISA = CFClient::Widget::Bin::;
313 449
314use SDL::OpenGL; 450use SDL::OpenGL;
315 451
316sub size_request { 452sub size_request {
317 my ($self) = @_; 453 my ($self) = @_;
… …
324} 460}
325 461
326sub size_allocate { 462sub size_allocate {
327 my ($self, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
328 464
465 return unless $self->{w} != $w || $self->{h} != $h;
466
329 $self->{w} = $w; 467 $self->{w} = $w;
330 $self->{h} = $h; 468 $self->{h} = $h;
331 469
332 $self->child->size_allocate ($w - 4, $h - 4); 470 $self->child->size_allocate ($w - 4, $h - 4);
333 $self->child->move (2, 2); 471 $self->child->move (2, 2);
… …
340 478
341 my ($w, $h) = $chld->size_request; 479 my ($w, $h) = $chld->size_request;
342 480
343 glBegin GL_QUADS; 481 glBegin GL_QUADS;
344 glColor 0, 0, 0; 482 glColor 0, 0, 0;
345 glTexCoord 0, 0; glVertex 0 , 0; 483 glVertex 0 , 0;
346 glTexCoord 0, 1; glVertex 0 , $h + 4; 484 glVertex 0 , $h + 4;
347 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 485 glVertex $w + 4 , $h + 4;
348 glTexCoord 1, 0; glVertex $w + 4 , 0; 486 glVertex $w + 4 , 0;
349 glEnd; 487 glEnd;
350 488
351 $chld->draw; 489 $chld->draw;
352} 490}
353 491
354############################################################################# 492#############################################################################
355 493
356package Crossfire::Client::Widget::FancyFrame; 494package CFClient::Widget::FancyFrame;
357 495
358our @ISA = Crossfire::Client::Widget::Bin::; 496our @ISA = CFClient::Widget::Bin::;
359 497
360use SDL::OpenGL; 498use SDL::OpenGL;
361 499
362my @tex = 500my @tex =
363 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
364 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 502 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
365 503
366sub size_request { 504sub size_request {
367 my ($self) = @_; 505 my ($self) = @_;
368 506
… …
377} 515}
378 516
379sub size_allocate { 517sub size_allocate {
380 my ($self, $w, $h) = @_; 518 my ($self, $w, $h) = @_;
381 519
520 return unless $self->{w} != $w || $self->{h} != $h;
521
382 $self->SUPER::size_allocate ($w, $h); 522 $self->SUPER::size_allocate ($w, $h);
383 523
384 $h -= $tex[1]->{height}; 524 $h -= $tex[1]->{height};
385 $h -= $tex[4]->{height}; 525 $h -= $tex[4]->{height};
386 $w -= $tex[2]->{width}; 526 $w -= $tex[2]->{width};
387 $w -= $tex[3]->{width}; 527 $w -= $tex[3]->{width};
388 528
389 $h = $h < 0 ? 0 : $h; 529 $h = $h < 0 ? 0 : $h;
390 $w = $w < 0 ? 0 : $w; 530 $w = $w < 0 ? 0 : $w;
391 531
532 my $child = $self->child;
533
392 $self->child->size_allocate ($w, $h); 534 $child->size_allocate ($w, $h);
393 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 535 $child->move ($tex[3]->{width}, $tex[1]->{height});
394} 536}
395 537
396sub _draw { 538sub _draw {
397 my ($self) = @_; 539 my ($self) = @_;
398 540
… …
403 glEnable GL_TEXTURE_2D; 545 glEnable GL_TEXTURE_2D;
404 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
406 548
407 my $top = $tex[1]; 549 my $top = $tex[1];
408 glBindTexture GL_TEXTURE_2D, $top->{name}; 550 $top->draw_quad (0, 0, $w, $top->{height});
409
410 glBegin GL_QUADS;
411 glTexCoord 0, 0; glVertex 0 , 0;
412 glTexCoord 0, 1; glVertex 0 , $top->{height};
413 glTexCoord 1, 1; glVertex $w , $top->{height};
414 glTexCoord 1, 0; glVertex $w , 0;
415 glEnd;
416 551
417 my $left = $tex[3]; 552 my $left = $tex[3];
418 glBindTexture GL_TEXTURE_2D, $left->{name}; 553 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
419
420 glBegin GL_QUADS;
421 glTexCoord 0, 0; glVertex 0 , $top->{height};
422 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
423 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
425 glEnd;
426 554
427 my $right = $tex[2]; 555 my $right = $tex[2];
428 glBindTexture GL_TEXTURE_2D, $right->{name}; 556 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
429
430 glBegin GL_QUADS;
431 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
432 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
433 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
434 glTexCoord 1, 0; glVertex $w , $top->{height};
435 glEnd;
436 557
437 my $bottom = $tex[4]; 558 my $bottom = $tex[4];
438 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 559 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
439
440 glBegin GL_QUADS;
441 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
442 glTexCoord 0, 1; glVertex 0 , $h;
443 glTexCoord 1, 1; glVertex $w , $h;
444 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
445 glEnd;
446 560
447 my $bg = $tex[0]; 561 my $bg = $tex[0];
448 glBindTexture GL_TEXTURE_2D, $bg->{name}; 562 glBindTexture GL_TEXTURE_2D, $bg->{name};
449 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
450 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 564 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
451 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 565 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
452 566
453 my $rep_x = $cw / $bg->{width}; 567 my $rep_x = $cw / $bg->{width};
454 my $rep_y = $ch / $bg->{height}; 568 my $rep_y = $ch / $bg->{height};
455 569
456 glBegin GL_QUADS; 570 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
457 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
458 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
459 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
460 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
461 glEnd;
462 571
463 glDisable GL_BLEND; 572 glDisable GL_BLEND;
464 glDisable GL_TEXTURE_2D; 573 glDisable GL_TEXTURE_2D;
465 574
466 $self->child->draw; 575 $self->child->draw;
467 576
468} 577}
469 578
470############################################################################# 579#############################################################################
471 580
472package Crossfire::Client::Widget::Table; 581package CFClient::Widget::Table;
473 582
474our @ISA = Crossfire::Client::Widget::Bin::; 583our @ISA = CFClient::Widget::Bin::;
475 584
476use SDL::OpenGL; 585use SDL::OpenGL;
477 586
478sub add { 587sub add {
479 my ($self, $x, $y, $chld) = @_; 588 my ($self, $x, $y, $chld) = @_;
… …
554 } 663 }
555} 664}
556 665
557############################################################################# 666#############################################################################
558 667
559package Crossfire::Client::Widget::VBox; 668package CFClient::Widget::VBox;
560 669
561our @ISA = Crossfire::Client::Widget::Container::; 670our @ISA = CFClient::Widget::Container::;
562 671
563use SDL::OpenGL; 672use SDL::OpenGL;
564 673
565sub size_request { 674sub size_request {
566 my ($self) = @_; 675 my ($self) = @_;
… …
574} 683}
575 684
576sub size_allocate { 685sub size_allocate {
577 my ($self, $w, $h) = @_; 686 my ($self, $w, $h) = @_;
578 687
688 return unless $self->{w} != $w || $self->{h} != $h;
689
579 $self->w ($w); 690 $self->{w} = $w;
580 $self->h ($h); 691 $self->{h} = $h;
581 692
582 my $exp; 693 return unless $self->{h};
583 my @oth; 694
584 # find expand widget 695 my $children = $self->{children};
585 for (@{$self->{children}}) { 696
586 if ($_->{expand}) { 697 my @h = map +($_->size_request)[1], @$children;
587 $exp = $_; 698
588 last; 699 my $req_h = List::Util::sum @h;
700
701 if ($req_h > $h) {
702 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h;
704 } else {
705 my @exp = grep $_->{expand}, @$children;
706 @exp = @$children unless @exp;
707
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) {
711 my $child = $children->[$_];
712
713 my $alloc_h = $h[$_];
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
589 } 716 }
590 push @oth, $_;
591 }
592
593 my ($ow, $oh);
594
595 # get sizes of other widgets
596 for (@oth) {
597 my ($w, $h) = $_->size_request;
598 $oh += $h;
599 if ($ow < $w) { $ow = $w }
600 } 717 }
601 718
602 my $y = 0; 719 my $y = 0;
603 for (@{$self->{children}}) { 720 for (0 .. $#$children) {
721 my $child = $children->[$_];
722 my $h = $h[$_];
604 $_->move (0, $y); 723 $child->move (0, $y);
605
606 if ($_ == $exp) {
607 $_->size_allocate ($w, $h - $oh);
608 $y += $h - $oh;
609 } else {
610 my ($cw, $h) = $_->size_request;
611 $_->size_allocate ($w, $h); 724 $child->size_allocate ($w, $h);
725
612 $y += $h; 726 $y += $h;
613 }
614 } 727 }
615} 728}
616 729
617############################################################################# 730#############################################################################
618 731
619package Crossfire::Client::Widget::Label; 732package CFClient::Widget::Label;
620 733
621our @ISA = Crossfire::Client::Widget::; 734our @ISA = CFClient::Widget::;
622 735
623use SDL::OpenGL; 736use SDL::OpenGL;
624 737
625sub new { 738sub new {
626 my ($class, $x, $y, $z, $height, $text) = @_; 739 my ($class, %arg) = @_;
627 740
628 # TODO: color, and make height, xyz etc. optional 741 my $self = $class->SUPER::new (
629 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 742 fg => [1, 1, 1],
743 height => $::FONTSIZE,
744 text => "",
745 layout => new CFClient::Layout,
746 %arg
747 );
630 748
631 $self->set_text ($text); 749 $self->set_text ($self->{text});
632 750
633 $self 751 $self
752}
753
754sub escape_text {
755 local $_ = $_[1];
756
757 s/&/&amp;/g;
758 s/>/&gt;/g;
759 s/</&lt;/g;
760
761 $_[1]
634} 762}
635 763
636sub set_text { 764sub set_text {
637 my ($self, $text) = @_; 765 my ($self, $text) = @_;
638 766
639 $self->{text} = $text; 767 $self->{text} = $text;
640 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 768 $self->{layout}->set_markup ($text);
641 769
770 delete $self->{texture};
642 $self->update; 771 $self->update;
643} 772}
644 773
645sub get_text { 774sub get_text {
646 my ($self, $text) = @_; 775 my ($self, $text) = @_;
… …
649} 778}
650 779
651sub size_request { 780sub size_request {
652 my ($self) = @_; 781 my ($self) = @_;
653 782
654 ( 783 $self->{layout}->set_width;
784 $self->{layout}->set_height ($self->{height});
785 $self->{layout}->size
786# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
787# (
655 $self->{texture}{width}, 788# $self->{texture}{width},
656 $self->{texture}{height}, 789# $self->{texture}{height},
657 ) 790# )
791# } else {
792# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
793#
794# ($w, $h)
795# }
796}
797
798sub size_allocate {
799 my ($self, $w, $h) = @_;
800
801 return unless $self->{w} != $w || $self->{h} != $h;
802
803 $self->SUPER::size_allocate ($w, $h);
804 delete $self->{texture};
805}
806
807sub update {
808 my ($self) = @_;
809
810 delete $self->{texture};
811 $self->SUPER::update;
658} 812}
659 813
660sub _draw { 814sub _draw {
661 my ($self) = @_; 815 my ($self) = @_;
662 816
663 my $tex = $self->{texture}; 817 my $tex = $self->{texture} ||= do {
818 $self->{layout}->set_width ($self->{w});
819 new_from_layout CFClient::Texture $self->{layout};
820 };
664 821
665 glEnable GL_BLEND; 822 glEnable GL_BLEND;
666 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
667 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
669 glBindTexture GL_TEXTURE_2D, $tex->{name};
670 826
671 glColor 1, 0, 0, 1; # TODO color 827 glColor @{$self->{fg}};
672 828
673 glBegin GL_QUADS; 829 $tex->draw_quad (0, 0);
674 glTexCoord 0, 0; glVertex 0 , 0;
675 glTexCoord 0, 1; glVertex 0 , $tex->{height};
676 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
677 glTexCoord 1, 0; glVertex $tex->{width}, 0;
678 glEnd;
679 830
680 glDisable GL_BLEND; 831 glDisable GL_BLEND;
681 glDisable GL_TEXTURE_2D; 832 glDisable GL_TEXTURE_2D;
682} 833}
683 834
684############################################################################# 835#############################################################################
685 836
686package Crossfire::Client::Widget::TextEntry; 837package CFClient::Widget::Entry;
687 838
688our @ISA = Crossfire::Client::Widget::Label::; 839our @ISA = CFClient::Widget::Label::;
689 840
690use SDL; 841use SDL;
691use SDL::OpenGL; 842use SDL::OpenGL;
692 843
844sub new {
845 my $class = shift;
846
847 $class->SUPER::new (
848 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4],
850 active_bg => [1, 1, 1],
851 active_fg => [0, 0, 0],
852 @_
853 )
854}
855
856sub _set_text {
857 my ($self, $text) = @_;
858
859 $self->{last_activity} = $::NOW;
860
861 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w});
863 $self->{layout}->set_markup ($self->escape_text ($text));
864
865 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text;
867
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
869}
870
871sub size_request {
872 my ($self) = @_;
873
874 my ($w, $h) = $self->SUPER::size_request;
875
876 ($w + 1, $h) # add 1 for cursor
877}
878
879sub size_allocate {
880 my ($self, $w, $h) = @_;
881
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 $self->_set_text ($self->{text});
887}
888
889sub set_text {
890 my ($self, $text) = @_;
891
892 $self->{cursor} = length $text;
893 $self->_set_text ($text);
894 $self->update;
895}
896
693sub key_down { 897sub key_down {
694 my ($self, $ev) = @_; 898 my ($self, $ev) = @_;
695 899
696 my $mod = $ev->key_mod; 900 my $mod = $ev->key_mod;
697 my $sym = $ev->key_sym; 901 my $sym = $ev->key_sym;
698 902
699 $ev->set_unicode (1);
700 my $uni = $ev->key_unicode; 903 my $uni = $ev->key_unicode;
701 904
702 my $text = $self->get_text; 905 my $text = $self->get_text;
703 906
704 if ($sym == SDLK_BACKSPACE) { 907 if ($sym == SDLK_BACKSPACE) {
705 substr $text, -1, 1, ''; 908 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
706 909 } elsif ($sym == SDLK_DELETE) {
910 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text};
707 } elsif ($uni) { 915 } elsif ($uni) {
708 $text .= chr $uni; 916 substr $text, $self->{cursor}++, 0, chr $uni;
709 } 917 }
918
710 $self->set_text ($text); 919 $self->_set_text ($text);
920 $self->update;
711} 921}
712 922
713############################################################################# 923sub focus_in {
924 my ($self) = @_;
714 925
926 $self->{last_activity} = $::NOW;
927
928 $self->SUPER::focus_in;
929}
930
931sub button_down {
932 my ($self, $ev, $x, $y) = @_;
933
934 $self->SUPER::button_down ($ev, $x, $y);
935
936 my $idx = $self->{layout}->xy_to_index ($x, $y);
937
938 # byte-index to char-index
939 my $text = $self->{layout};
940 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx;
942
943 $self->_set_text ($self->{text});
944 $self->update;
945}
946
947sub mouse_motion {
948 my ($self, $ev, $x, $y) = @_;
949# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
950}
951
952sub _draw {
953 my ($self) = @_;
954
955 local $self->{fg} = $self->{fg};
956
957 if ($FOCUS == $self) {
958 glColor @{$self->{active_bg}};
959 $self->{fg} = $self->{active_fg};
960 } else {
961 glColor @{$self->{bg}};
962 }
963
964 glBegin GL_QUADS;
965 glVertex 0 , 0;
966 glVertex 0 , $self->{h};
967 glVertex $self->{w}, $self->{h};
968 glVertex $self->{w}, 0;
969 glEnd;
970
971 $self->SUPER::_draw;
972
973 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
975 glColor @{$self->{fg}};
976 glBegin GL_LINES;
977 glVertex $self->{cur_x}, $self->{cur_y};
978 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979 glEnd;
980 }
981}
982
983#############################################################################
984
985package CFClient::Widget::Slider;
986
987use strict;
988
989use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991
992our @ISA = CFClient::Widget::DrawBG::;
993
994sub size_request {
995 my ($self) = @_;
996
997 my $w = 20;
998 my $h = 10;
999
1000 $self->{vertical} ? ($h, $w) : ($w, $h)
1001}
1002
1003sub new {
1004 my $class = shift;
1005
1006 # range [value, low, high, page]
1007
1008 $class->SUPER::new (
1009 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10],
1012 vertical => 0,
1013 @_
1014 )
1015}
1016
1017sub button_down {
1018 my ($self, $ev, $x, $y) = @_;
1019
1020 $self->SUPER::button_down ($ev, $x, $y);
1021 $self->mouse_motion ($ev, $x, $y);
1022}
1023
1024sub mouse_motion {
1025 my ($self, $ev, $x, $y) = @_;
1026
1027 if ($GRAB == $self) {
1028 my ($value, $lo, $hi, $page) = @{$self->{range}};
1029
1030 $x = $x * ($hi - $lo) / $self->{w} + $lo;
1031 $x = $lo if $x < $lo;
1032 $x = $hi - $page if $x > $hi - $page;
1033 $self->{range}[0] = $x;
1034
1035 $self->{changed}($x) if $self->{changed};
1036 $self->update;
1037 }
1038}
1039
1040sub _draw {
1041 my ($self) = @_;
1042
1043 $self->SUPER::_draw ();
1044
1045 glPushMatrix;
1046
1047 my ($w, $h) = @$self{qw(w h)};
1048
1049 if ($self->{vertical}) {
1050 # draw a vertical slider like a rotated horizontal slider
1051
1052 glTranslate 0, $self->{w};
1053 glRotate 90, 0, 0, 1;
1054
1055 ($w, $h) = ($h, $w);
1056 }
1057
1058 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1059 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1060
1061 my ($value, $lo, $hi, $page) = @{$self->{range}};
1062
1063 $page = int $page * $w / ($hi - $lo);
1064 $value = int +($value - $lo) * $w / ($hi - $lo);
1065
1066 $w -= $page;
1067 $page &= ~1;
1068 glTranslate $page * 0.5, 0, 0;
1069
1070 glColor @$fg;
1071 glBegin GL_LINES;
1072 glVertex 0, 0; glVertex 0, $h;
1073 glVertex $w - 1, 0; glVertex $w - 1, $h;
1074 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1075 glEnd;
1076
1077 my $knob_a = $value - $page * 0.5;
1078 my $knob_b = $value + $page * 0.5;
1079
1080 glBegin GL_QUADS;
1081 glColor @$fg;
1082 glVertex $knob_a, 0;
1083 glVertex $knob_a, $h;
1084 glVertex $knob_b, $h;
1085 glVertex $knob_b, 0;
1086
1087 if ($knob_a < $knob_b - 2) {
1088 glColor @$bg;
1089 glVertex $knob_a + 1, 1;
1090 glVertex $knob_a + 1, $h - 1;
1091 glVertex $knob_b - 1, $h - 1;
1092 glVertex $knob_b - 1, 1;
1093 }
1094 glEnd;
1095
1096 glPopMatrix;
1097}
1098
1099#############################################################################
1100
715package Crossfire::Client::Widget::MapWidget; 1101package CFClient::Widget::MapWidget;
716 1102
717use strict; 1103use strict;
718 1104
719use List::Util qw(min max); 1105use List::Util qw(min max);
720 1106
721use SDL; 1107use SDL;
722use SDL::OpenGL; 1108use SDL::OpenGL;
723use SDL::OpenGL::Constants; 1109use SDL::OpenGL::Constants;
724 1110
725our @ISA = Crossfire::Client::Widget::; 1111our @ISA = CFClient::Widget::;
1112
1113sub new {
1114 my $class = shift;
1115
1116 $class->SUPER::new (
1117 z => -1,
1118 list => (glGenLists 1),
1119 @_
1120 )
1121}
726 1122
727sub key_down { 1123sub key_down {
728 print "MAPKEYDOWN\n"; 1124 print "MAPKEYDOWN\n";
729} 1125}
730 1126
731sub key_up { 1127sub key_up {
732} 1128}
733 1129
734sub size_request { 1130sub size_request {
735 1131 (
1132 1 + int $::WIDTH / 32,
1133 1 + int $::HEIGHT / 32,
1134 )
736} 1135}
737 1136
738sub size_allocate { 1137sub update {
1138 my ($self) = @_;
1139
1140 $self->{need_update} = 1;
739} 1141}
740 1142
741sub _draw { 1143sub _draw {
742 my ($self) = @_; 1144 my ($self) = @_;
743 1145
1146 if (delete $self->{need_update}) {
1147 glNewList $self->{list}, GL_COMPILE;
1148
744 my $mx = $::CONN->{mapx}; 1149 my $mx = $::CONN->{mapx};
745 my $my = $::CONN->{mapy}; 1150 my $my = $::CONN->{mapy};
746 1151
747 my $map = $::CONN->{map}; 1152 my $map = $::CONN->{map};
748 1153
749 my ($xofs, $yofs); 1154 my ($xofs, $yofs);
750 1155
751 my $sw = 1 + int $::WIDTH / 32; 1156 my $sw = 1 + int $::WIDTH / 32;
752 my $sh = 1 + int $::HEIGHT / 32; 1157 my $sh = 1 + int $::HEIGHT / 32;
753 1158
754 if ($::CONN->{mapw} > $sw) { 1159 if ($::CONN->{mapw} > $sw) {
755 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1160 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
756 } else { 1161 } else {
757 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1162 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
758 } 1163 }
759 1164
760 if ($::CONN->{maph} > $sh) { 1165 if ($::CONN->{maph} > $sh) {
761 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1166 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
762 } else { 1167 } else {
763 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1168 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
764 } 1169 }
765 1170
766 glEnable GL_TEXTURE_2D; 1171 glEnable GL_TEXTURE_2D;
767 glEnable GL_BLEND; 1172 glEnable GL_BLEND;
768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1173 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
769 1174
770 my $sw4 = ($sw + 3) & ~3; 1175 my $sw4 = ($sw + 3) & ~3;
771 my $lighting = "\x00" x ($sw4 * $sh); 1176 my $darkness = "\x00" x ($sw4 * $sh);
772 1177
773 for my $x (0 .. $sw - 1) { 1178 for my $x (0 .. $sw - 1) {
1179 my $row = $map->[$x + $xofs];
774 for my $y (0 .. $sh - 1) { 1180 for my $y (0 .. $sh - 1) {
775 1181
776 my $cell = $map->[$x + $xofs][$y + $yofs] 1182 my $cell = $row->[$y + $yofs]
777 or next; 1183 or next;
778 1184
779 my $darkness = $cell->[0] * (1 / 255); 1185 my $dark = $cell->[0];
780 if ($darkness < 0) { 1186 if ($dark < 0) {
781 $darkness = 0.15; 1187 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1188 } else {
1189 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
782 } 1190 }
783 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
784 1191
785 for my $num (grep $_, @$cell[1,2,3]) { 1192 for my $num (grep $_, @$cell[1,2,3]) {
786 my $tex = $::CONN->{face}[$num]{texture} || next; 1193 my $tex = $::CONN->{face}[$num]{texture} || next;
787 1194
788 glBindTexture GL_TEXTURE_2D, $tex->{name};
789
790 my $w = $tex->{width}; 1195 my $w = $tex->{width};
791 my $h = $tex->{height}; 1196 my $h = $tex->{height};
792 1197
793 my $px = ($x + 1) * 32 - $w; 1198 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
794 my $py = ($y + 1) * 32 - $h;
795
796 glBegin GL_QUADS;
797 glTexCoord 0, 0; glVertex $px , $py;
798 glTexCoord 0, 1; glVertex $px , $py + $h;
799 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
800 glTexCoord 1, 0; glVertex $px + $w, $py;
801 glEnd; 1199 }
802 } 1200 }
803 } 1201 }
804 }
805 1202
806# if (1) { # higher quality darkness 1203# if (1) { # higher quality darkness
807# $lighting =~ s/(.)/$1$1$1/gs; 1204# $lighting =~ s/(.)/$1$1$1/gs;
808# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1205# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
809# 1206#
… …
811# 1208#
812# $lighting = $pb->get_pixels; 1209# $lighting = $pb->get_pixels;
813# $lighting =~ s/(.)../$1/gs; 1210# $lighting =~ s/(.)../$1/gs;
814# } 1211# }
815 1212
816 $lighting = new Crossfire::Client::Texture
817 width => $sw4,
818 height => $sh,
819 data => $lighting,
820 internalformat => GL_ALPHA4,
821 format => GL_ALPHA;
822
823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1213 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
824 glColor 0, 0, 0, 0.75;
825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
826 glBindTexture GL_TEXTURE_2D, $lighting->{name};
827 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
828 glBegin GL_QUADS;
829 glTexCoord 0, 0; glVertex 0 , 0;
830 glTexCoord 0, 1; glVertex 0 , $sh * 32;
831 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
832 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
833 glEnd;
834 1215
1216 $darkness = new CFClient::Texture
1217 width => $sw4,
1218 height => $sh,
1219 data => $darkness,
1220 internalformat => GL_ALPHA,
1221 format => GL_ALPHA;
1222
1223 glColor 0.45, 0.45, 0.45, 1;
1224 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1225
835 glDisable GL_TEXTURE_2D; 1226 glDisable GL_TEXTURE_2D;
836 glDisable GL_BLEND; 1227 glDisable GL_BLEND;
1228
1229 glEndList;
1230 }
1231
1232 glCallList $self->{list};
837} 1233}
838 1234
839my %DIR = ( 1235my %DIR = (
840 SDLK_KP8, [1, "north"], 1236 SDLK_KP8, [1, "north"],
841 SDLK_KP9, [2, "northeast"], 1237 SDLK_KP9, [2, "northeast"],
… …
887 } 1283 }
888} 1284}
889 1285
890############################################################################# 1286#############################################################################
891 1287
892package Crossfire::Client::Widget::Animator; 1288package CFClient::Widget::Animator;
893 1289
894use SDL::OpenGL; 1290use SDL::OpenGL;
895 1291
896our @ISA = Crossfire::Client::Widget::Bin::; 1292our @ISA = CFClient::Widget::Bin::;
897 1293
898sub moveto { 1294sub moveto {
899 my ($self, $x, $y) = @_; 1295 my ($self, $x, $y) = @_;
900 1296
901 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
902 $self->{speed} = 0.2; 1298 $self->{speed} = 0.001;
903 $self->{time} = 1; 1299 $self->{time} = 1;
904 1300
905 ::animation_start $self; 1301 ::animation_start $self;
906} 1302}
907 1303
… …
922 1318
923sub _draw { 1319sub _draw {
924 my ($self) = @_; 1320 my ($self) = @_;
925 1321
926 glPushMatrix; 1322 glPushMatrix;
927 glRotate $self->{time} * 10000, 0, 1, 0; 1323 glRotate $self->{time} * 1000, 0, 1, 0;
928 $self->{children}[0]->draw; 1324 $self->{children}[0]->draw;
929 glPopMatrix; 1325 glPopMatrix;
930} 1326}
931 1327
9321; 1328#############################################################################
933 1329
1330package CFClient::Widget::Toplevel;
1331
1332our @ISA = CFClient::Widget::Container::;
1333
1334sub size_request {
1335 ($::WIDTH, $::HEIGHT)
1336}
1337
1338sub size_allocate {
1339 my ($self, $w, $h) = @_;
1340
1341 $self->SUPER::size_allocate ($w, $h);
1342
1343 $_->size_allocate ($_->size_request)
1344 for @{$self->{children}};
1345}
1346
1347sub translate {
1348 my ($self, $x, $y) = @_;
1349
1350 ($x, $y)
1351}
1352
1353sub update {
1354 my ($self) = @_;
1355
1356 $self->size_allocate ($self->size_request);
1357 ::refresh ();
1358}
1359
1360sub add {
1361 my ($self, $widget) = @_;
1362
1363 $self->SUPER::add ($widget);
1364
1365 $widget->size_allocate ($widget->size_request);
1366}
1367
1368sub draw {
1369 my ($self) = @_;
1370
1371 $self->_draw;
1372}
1373
1374#############################################################################
1375
1376package CFClient::Widget;
1377
1378$TOPLEVEL = new CFClient::Widget::Toplevel;
1379
13801
1381

Diff Legend

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