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.67 by root, Tue Apr 11 14:36:59 2006 UTC vs.
Revision 1.76 by root, Tue Apr 11 21:24:09 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 bless {
79 x => 0, 85 x => 0,
80 y => 0, 86 y => 0,
81 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
82 @_ 90 @_
83 }, $class 91 }, $class
84} 92}
85 93
86sub move { 94sub move {
… …
97sub size_request { 105sub size_request {
98 require Carp; 106 require Carp;
99 Carp::confess "size_request is abtract"; 107 Carp::confess "size_request is abtract";
100} 108}
101 109
102sub size_allocate { 110sub _size_allocate {
103 my ($self, $w, $h) = @_; 111 my ($self, $x, $y, $w, $h) = @_;
112
113 $self->{x} = $x;
114 $self->{y} = $y;
115
116 return unless $self->{w} != $w || $self->{h} != $h;
104 117
105 $self->{w} = $w; 118 $self->{w} = $w;
106 $self->{h} = $h; 119 $self->{h} = $h;
120
121 1
122}
123
124sub size_allocate {
125 my ($self, $x, $y, $w, $h) = @_;
126
127 $self->_size_allocate ($x, $y, $w, $h);
107} 128}
108 129
109# translate global koordinates to local coordinate system 130# translate global koordinates to local coordinate system
110sub translate { 131sub translate {
111 my ($self, $x, $y) = @_; 132 my ($self, $x, $y) = @_;
… …
114} 135}
115 136
116sub focus_in { 137sub focus_in {
117 my ($self) = @_; 138 my ($self) = @_;
118 139
140 return if $FOCUS == $self;
141
119 my $focus = $FOCUS; $FOCUS = $self; 142 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 143 $focus->update if $focus;
121 $FOCUS->update; 144 $FOCUS->update;
122} 145}
123 146
… …
130 $focus->update if $focus; #? 153 $focus->update if $focus; #?
131} 154}
132 155
133sub mouse_motion { } 156sub mouse_motion { }
134sub button_up { } 157sub button_up { }
135sub button_down { }
136sub key_down { } 158sub key_down { }
137sub key_up { } 159sub key_up { }
160
161sub button_down {
162 my ($self, $ev, $x, $y) = @_;
163
164 $self->focus_in;
165}
138 166
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 167sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 168sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 169sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 170sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 171sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 172
145sub draw { 173sub draw {
146 my ($self) = @_; 174 my ($self) = @_;
147 175
176 return unless $self->{h} && $self->{w};
177
148 glPushMatrix; 178 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 179 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 180 $self->_draw;
181 glPopMatrix;
182
151 if ($self == $HOVER) { 183 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4; 184 my ($x, $y) = @$self{qw(x y)};
185
186 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 187 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 189 glBegin GL_QUADS;
155 glVertex 0 , 0; 190 glVertex $x , $y;
156 glVertex $self->{w}, 0; 191 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 192 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 193 glVertex $x , $y + $self->{h};
159 glEnd; 194 glEnd;
160 glDisable GL_BLEND; 195 glDisable GL_BLEND;
161 } 196 }
162 glPopMatrix;
163} 197}
164 198
165sub _draw { 199sub _draw {
166 my ($self) = @_; 200 my ($self) = @_;
167 201
… …
207 241
208 $self->{parent}->update 242 $self->{parent}->update
209 if $self->{parent}; 243 if $self->{parent};
210} 244}
211 245
246sub connect {
247 my ($self, $signal, $cb) = @_;
248
249 push @{ $self->{cb}{$signal} }, $cb;
250}
251
252sub emit {
253 my ($self, $signal, @args) = @_;
254
255 $_->($self, @args)
256 for @{$self->{cb}{$signal} || []};
257}
258
212sub DESTROY { 259sub DESTROY {
213 my ($self) = @_; 260 my ($self) = @_;
214 261
215 #$self->deactivate; 262 #$self->deactivate;
216} 263}
217 264
218############################################################################# 265#############################################################################
219 266
267package CFClient::UI::DrawBG;
268
269our @ISA = CFClient::UI::Base::;
270
271use strict;
272use SDL::OpenGL;
273
274sub new {
275 my $class = shift;
276
277 # range [value, low, high, page]
278
279 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1],
282 @_
283 )
284}
285
286sub _draw {
287 my ($self) = @_;
288
289 my ($w, $h) = @$self{qw(w h)};
290
291 glEnable GL_BLEND;
292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
293 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
294
295 glBegin GL_QUADS;
296 glVertex 0 , 0;
297 glVertex 0 , $h;
298 glVertex $w, $h;
299 glVertex $w, 0;
300 glEnd;
301
302 glDisable GL_BLEND;
303}
304
305#############################################################################
306
220package CFClient::Widget::Empty; 307package CFClient::UI::Empty;
221 308
222our @ISA = CFClient::Widget::; 309our @ISA = CFClient::UI::Base::;
223 310
224sub size_request { 311sub size_request {
225 (0, 0) 312 (0, 0)
226} 313}
227 314
228sub draw { } 315sub draw { }
229 316
230############################################################################# 317#############################################################################
231 318
232package CFClient::Widget::Container; 319package CFClient::UI::Container;
233 320
234our @ISA = CFClient::Widget::; 321our @ISA = CFClient::UI::Base::;
235 322
236sub new { 323sub new {
237 my ($class, %arg) = @_; 324 my ($class, %arg) = @_;
238 325
239 my $children = delete $arg{children} || []; 326 my $children = delete $arg{children} || [];
… …
253 $self->{children} = [ 340 $self->{children} = [
254 sort { $a->{z} <=> $b->{z} } 341 sort { $a->{z} <=> $b->{z} }
255 @{$self->{children}}, $chld 342 @{$self->{children}}, $chld
256 ]; 343 ];
257 344
258 $self->size_allocate ($self->{w}, $self->{h}) 345 $self->{w} = $self->{h} = -1;
259 if $self->{w}; #TODO: check for "realised state" 346 $self->update;
260} 347}
261 348
262sub remove { 349sub remove {
263 my ($self, $widget) = @_; 350 my ($self, $widget) = @_;
264 351
265 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 352 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
266 353
267 $self->size_allocate ($self->{w}, $self->{h}); 354 $self->size_allocate (0, 0, $self->{w}, $self->{h});
268} 355}
269 356
270sub find_widget { 357sub find_widget {
271 my ($self, $x, $y) = @_; 358 my ($self, $x, $y) = @_;
272 359
… …
289 $_->draw for @{$self->{children}}; 376 $_->draw for @{$self->{children}};
290} 377}
291 378
292############################################################################# 379#############################################################################
293 380
294package CFClient::Widget::Bin; 381package CFClient::UI::Bin;
295 382
296our @ISA = CFClient::Widget::Container::; 383our @ISA = CFClient::UI::Container::;
297 384
298sub new { 385sub new {
299 my ($class, %arg) = @_; 386 my ($class, %arg) = @_;
300 387
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 388 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
302 389
303 $class->SUPER::new (children => [$child], %arg) 390 $class->SUPER::new (children => [$child], %arg)
304} 391}
305 392
306sub add { 393sub add {
… …
314sub remove { 401sub remove {
315 my ($self, $widget) = @_; 402 my ($self, $widget) = @_;
316 403
317 $self->SUPER::remove ($widget); 404 $self->SUPER::remove ($widget);
318 405
319 $self->{children} = [new CFClient::Widget::Empty] 406 $self->{children} = [new CFClient::UI::Empty]
320 unless @{$self->{children}}; 407 unless @{$self->{children}};
321} 408}
322 409
323sub child { $_[0]->{children}[0] } 410sub child { $_[0]->{children}[0] }
324 411
325sub size_request { 412sub size_request {
326 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 413 $_[0]{children}[0]->size_request
327} 414}
328 415
329sub size_allocate { 416sub size_allocate {
330 my ($self, $w, $h) = @_; 417 my ($self, $x, $y, $w, $h) = @_;
331 418
332 $self->SUPER::size_allocate ($w, $h); 419 $self->_size_allocate ($x, $y, $w, $h) or return;
420
333 $self->{children}[0]->size_allocate ($w, $h) 421 $self->{children}[0]->size_allocate (0, 0, $w, $h);
334 if $self->{children}[0]
335} 422}
336 423
337############################################################################# 424#############################################################################
338 425
339package CFClient::Widget::Window; 426package CFClient::UI::Window;
340 427
341our @ISA = CFClient::Widget::Bin::; 428our @ISA = CFClient::UI::Bin::;
342 429
343use SDL::OpenGL; 430use SDL::OpenGL;
344 431
345sub new { 432sub new {
346 my ($class, %arg) = @_; 433 my ($class, %arg) = @_;
… …
364 $self->{w}, $self->{h}, sub { $self->child->draw } 451 $self->{w}, $self->{h}, sub { $self->child->draw }
365 ); 452 );
366} 453}
367 454
368sub size_allocate { 455sub size_allocate {
369 my ($self, $w, $h) = @_; 456 my ($self, $x, $y, $w, $h) = @_;
370 457
371 $self->{w} = $w; 458 $self->_size_allocate ($x, $y, $w, $h) or return;
372 $self->{h} = $h;
373 459
374 $self->child->size_allocate ($w, $h); 460 $self->child->size_allocate (0, 0, $w, $h);
375 461
376 $self->render_chld; 462 $self->render_chld;
377} 463}
378 464
379sub _draw { 465sub _draw {
… …
383 469
384 my $tex = $self->{texture} 470 my $tex = $self->{texture}
385 or return; 471 or return;
386 472
387 glEnable GL_BLEND; 473 glEnable GL_BLEND;
474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
388 glEnable GL_TEXTURE_2D; 475 glEnable GL_TEXTURE_2D;
389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
390 477
391 $tex->draw_quad (0, 0, $w, $h); 478 $tex->draw_quad (0, 0, $w, $h);
392 479
… …
394 glDisable GL_TEXTURE_2D; 481 glDisable GL_TEXTURE_2D;
395} 482}
396 483
397############################################################################# 484#############################################################################
398 485
399package CFClient::Widget::Frame; 486package CFClient::UI::Frame;
400 487
401our @ISA = CFClient::Widget::Bin::; 488our @ISA = CFClient::UI::Bin::;
402 489
403use SDL::OpenGL; 490use SDL::OpenGL;
404 491
405sub size_request { 492sub size_request {
406 my ($self) = @_; 493 my ($self) = @_;
… …
411 498
412 map { $_ + 4 } $chld->size_request; 499 map { $_ + 4 } $chld->size_request;
413} 500}
414 501
415sub size_allocate { 502sub size_allocate {
416 my ($self, $w, $h) = @_; 503 my ($self, $x, $y, $w, $h) = @_;
417 504
418 $self->{w} = $w; 505 $self->_size_allocate ($x, $y, $w, $h) or return;
419 $self->{h} = $h;
420 506
421 $self->child->size_allocate ($w - 4, $h - 4); 507 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
422 $self->child->move (2, 2);
423} 508}
424 509
425sub _draw { 510sub _draw {
426 my ($self) = @_; 511 my ($self) = @_;
427 512
… …
440 $chld->draw; 525 $chld->draw;
441} 526}
442 527
443############################################################################# 528#############################################################################
444 529
445package CFClient::Widget::FancyFrame; 530package CFClient::UI::FancyFrame;
446 531
447our @ISA = CFClient::Widget::Bin::; 532our @ISA = CFClient::UI::Bin::;
448 533
449use SDL::OpenGL; 534use SDL::OpenGL;
450 535
451my @tex = 536my @tex =
452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 537 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
455sub size_request { 540sub size_request {
456 my ($self) = @_; 541 my ($self) = @_;
457 542
458 my ($w, $h) = $self->SUPER::size_request; 543 my ($w, $h) = $self->SUPER::size_request;
459 544
460 $h += $tex[1]->{height}; 545 $h += $tex[1]->{h};
461 $h += $tex[4]->{height}; 546 $h += $tex[4]->{h};
462 $w += $tex[2]->{width}; 547 $w += $tex[2]->{w};
463 $w += $tex[3]->{width}; 548 $w += $tex[3]->{w};
464 549
465 ($w, $h) 550 ($w, $h)
466} 551}
467 552
468sub size_allocate { 553sub size_allocate {
469 my ($self, $w, $h) = @_; 554 my ($self, $x, $y, $w, $h) = @_;
470 555
471 $self->SUPER::size_allocate ($w, $h); 556 $self->_size_allocate ($x, $y, $w, $h) or return;
472 557
473 $h -= $tex[1]->{height}; 558 $h -= $tex[1]->{h};
474 $h -= $tex[4]->{height}; 559 $h -= $tex[4]->{h};
475 $w -= $tex[2]->{width}; 560 $w -= $tex[2]->{w};
476 $w -= $tex[3]->{width}; 561 $w -= $tex[3]->{w};
477 562
478 $h = $h < 0 ? 0 : $h; 563 $h = $h < 0 ? 0 : $h;
479 $w = $w < 0 ? 0 : $w; 564 $w = $w < 0 ? 0 : $w;
480 565
481 my $child = $self->child; 566 my $child = $self->child;
482 567
483 $child->size_allocate ($w, $h); 568 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
484 $child->move ($tex[3]->{width}, $tex[1]->{height});
485} 569}
486 570
487sub _draw { 571sub _draw {
488 my ($self) = @_; 572 my ($self) = @_;
489 573
490 my ($w, $h) = ($self->{w}, $self->{h}); 574 my ($w, $h) = ($self->{w}, $self->{h});
491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 575 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
492 576
493 glEnable GL_BLEND; 577 glEnable GL_BLEND;
578 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
494 glEnable GL_TEXTURE_2D; 579 glEnable GL_TEXTURE_2D;
495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
497 581
498 my $top = $tex[1]; 582 my $top = $tex[1];
499 $top->draw_quad (0, 0, $w, $top->{height}); 583 $top->draw_quad (0, 0, $w, $top->{h});
500 584
501 my $left = $tex[3]; 585 my $left = $tex[3];
502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 586 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
503 587
504 my $right = $tex[2]; 588 my $right = $tex[2];
505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 589 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
506 590
507 my $bottom = $tex[4]; 591 my $bottom = $tex[4];
508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 592 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
509 593
510 my $bg = $tex[0]; 594 my $bg = $tex[0];
595
511 glBindTexture GL_TEXTURE_2D, $bg->{name}; 596 glBindTexture GL_TEXTURE_2D, $bg->{name};
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 598 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 599 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
515 600
516 my $rep_x = $cw / $bg->{width}; 601 my $rep_x = $cw / $bg->{w};
517 my $rep_y = $ch / $bg->{height}; 602 my $rep_y = $ch / $bg->{h};
518 603
519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 604 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
520 605
606 glDisable GL_TEXTURE_2D;
521 glDisable GL_BLEND; 607 glDisable GL_BLEND;
522 glDisable GL_TEXTURE_2D;
523 608
524 $self->child->draw; 609 $self->child->draw;
525 610
526} 611}
527 612
528############################################################################# 613#############################################################################
529 614
530package CFClient::Widget::Table; 615package CFClient::UI::Table;
531 616
532our @ISA = CFClient::Widget::Bin::; 617our @ISA = CFClient::UI::Base::;
618
619use List::Util qw(max sum);
533 620
534use SDL::OpenGL; 621use SDL::OpenGL;
535 622
536sub add { 623sub add {
537 my ($self, $x, $y, $chld) = @_; 624 my ($self, $x, $y, $chld) = @_;
538 my $old_chld = $self->{children}[$y][$x];
539 625
540 $self->{children}[$y][$x] = $chld; 626 $self->{children}[$y][$x] = $chld;
541 $chld->set_parent ($self); 627 $chld->set_parent ($self);
628
629 $self->{w} = $self->{h} = -1;
542 $self->update; 630 $self->update;
543} 631}
544 632
545sub max_row_height { 633sub get_wh {
546 my ($self, $row) = @_; 634 my ($self) = @_;
547 635
548 my $hs = 0; 636 my (@w, @h);
549 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 637
638 for my $y (0 .. $#{$self->{children}}) {
550 my $c = $self->{children}->[$row]->[$xi]; 639 my $row = $self->{children}[$y]
551 if ($c) { 640 or next;
641
642 for my $x (0 .. $#$row) {
643 my $widget = $row->[$x]
644 or next;
552 my ($w, $h) = $c->size_request; 645 my ($w, $h) = $widget->size_request;
553 if ($hs < $h) { $hs = $h } 646
647 $w[$x] = max $w[$x], $w;
648 $h[$y] = max $h[$y], $h;
554 } 649 }
555 } 650 }
556 return $hs;
557}
558 651
559sub max_col_width { 652 (\@w, \@h)
653}
654
655sub size_request {
560 my ($self, $col) = @_; 656 my ($self) = @_;
561 657
658 my ($ws, $hs) = $self->get_wh;
659
660 (
661 (List::Util::sum @$ws),
662 (List::Util::sum @$hs),
663 )
664}
665
666sub size_allocate {
667 my ($self, $x, $y, $w, $h) = @_;
668
669 $self->_size_allocate ($x, $y, $w, $h) or return;
670
671 my ($ws, $hs) = $self->get_wh;
672
673 my $req_w = List::Util::sum @$ws;
674 my $req_h = List::Util::sum @$hs;
675
676 # linearly scale sizes
677 $_ *= $req_w / $w for @$ws;
678 $_ *= $req_h / $h for @$hs;
679
680 my $y;
681
682 for my $r (0 .. $#{$self->{children}}) {
683 my $row = $self->{children}[$r]
684 or next;
685
562 my $ws = 0; 686 my $x = 0;
563 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 687 my $row_h = $hs->[$r];
564 my $c = ($self->{children}->[$yi] || [])->[$col]; 688
565 if ($c) { 689 for my $c (0 .. $#$row) {
566 my ($w, $h) = $c->size_request; 690 my $widget = $row->[$c]
567 if ($ws < $w) { $ws = $w } 691 or next;
692
693 my $col_w = $ws->[$c];
694
695 $widget->size_allocate ($x, $y, $col_w, $row_h);
696
697 $x += $col_w;
568 } 698 }
699
700 $y += $row_h;
569 } 701 }
570 return $ws; 702
571} 703}
704
705sub find_widget {
706 my ($self, $x, $y) = @_;
707
708 $x -= $self->{x};
709 $y -= $self->{y};
710
711 my $res;
712
713 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
714 $res = $_->find_widget ($x, $y)
715 and return $res;
716 }
717
718 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 for (grep $_, @{$self->{children}}) {
725 $_->draw for grep $_, @$_;
726 }
727}
728
729#############################################################################
730
731package CFClient::UI::HBox;
732
733# TODO: wrap into common Box base class
734
735our @ISA = CFClient::UI::Container::;
572 736
573sub size_request { 737sub size_request {
574 my ($self) = @_; 738 my ($self) = @_;
575 739
740 my @alloc = map [$_->size_request], @{$self->{children}};
741
742 (
743 (List::Util::sum map $_->[0], @alloc),
744 (List::Util::max map $_->[1], @alloc),
745 )
746}
747
748sub size_allocate {
749 my ($self, $x, $y, $w, $h) = @_;
750
751 $self->_size_allocate ($x, $y, $w, $h) or return;
752
753 return unless $self->{w};
754
576 my ($hs, $ws) = (0, 0); 755 ($h, $w) = ($w, $h);
577 756
578 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 757 my $children = $self->{children};
579 $hs += $self->max_row_height ($yi);
580 }
581 758
582 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 759 my @h = map +($_->size_request)[0], @$children;
583 my $wm = 0; 760
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 761 my $req_h = List::Util::sum @h;
585 $wm += $self->max_col_width ($xi) 762
763 if ($req_h > $h) {
764 # ah well, not enough space
765 $_ = $h[$_] * $h / $req_h for @h;
766 } else {
767 my @exp = grep $_->{expand}, @$children;
768 @exp = @$children unless @exp;
769
770 my %exp = map +($_ => 1), @exp;
771
772 for (0 .. $#$children) {
773 my $child = $children->[$_];
774
775 my $alloc_h = $h[$_];
776 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
777 $h[$_] = $alloc_h;
586 } 778 }
587 if ($ws < $wm) { $ws = $wm }
588 } 779 }
589
590 return ($ws, $hs);
591}
592
593sub _draw {
594 my ($self) = @_;
595 780
596 my $y = 0; 781 my $y = 0;
597 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 782 for (0 .. $#$children) {
783 my $child = $children->[$_];
598 my $x = 0; 784 my $h = $h[$_];
785 $child->size_allocate ($y, 0, $h, $w);
599 786
600 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 787 $y += $h;
601
602 my $c = $self->{children}->[$yi]->[$xi];
603 if ($c) {
604 $c->move ($x, $y, 0); #TODO: Move to size_request
605 $c->draw if $c;
606 }
607
608 $x += $self->max_col_width ($xi);
609 }
610
611 $y += $self->max_row_height ($yi);
612 } 788 }
613} 789}
614 790
615############################################################################# 791#############################################################################
616 792
617package CFClient::Widget::VBox; 793package CFClient::UI::VBox;
618 794
795# TODO: wrap into common Box base class
796
619our @ISA = CFClient::Widget::Container::; 797our @ISA = CFClient::UI::Container::;
620
621use SDL::OpenGL;
622 798
623sub size_request { 799sub size_request {
624 my ($self) = @_; 800 my ($self) = @_;
625 801
626 my @alloc = map [$_->size_request], @{$self->{children}}; 802 my @alloc = map [$_->size_request], @{$self->{children}};
… …
630 (List::Util::sum map $_->[1], @alloc), 806 (List::Util::sum map $_->[1], @alloc),
631 ) 807 )
632} 808}
633 809
634sub size_allocate { 810sub size_allocate {
635 my ($self, $w, $h) = @_; 811 my ($self, $x, $y, $w, $h) = @_;
636 812
637 $self->w ($w); 813 $self->_size_allocate ($x, $y, $w, $h) or return;
638 $self->h ($h);
639 814
640 my $exp; 815 return unless $self->{h};
641 my @oth; 816
642 # find expand widget 817 my $children = $self->{children};
643 for (@{$self->{children}}) { 818
644 if ($_->{expand}) { 819 my @h = map +($_->size_request)[1], @$children;
645 $exp = $_; 820
646 last; 821 my $req_h = List::Util::sum @h;
822
823 if ($req_h > $h) {
824 # ah well, not enough space
825 $_ = $h[$_] * $h / $req_h for @h;
826 } else {
827 my @exp = grep $_->{expand}, @$children;
828 @exp = @$children unless @exp;
829
830 my %exp = map +($_ => 1), @exp;
831
832 for (0 .. $#$children) {
833 my $child = $children->[$_];
834
835 my $alloc_h = $h[$_];
836 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
837 $h[$_] = $alloc_h;
647 } 838 }
648 push @oth, $_;
649 }
650
651 my ($ow, $oh);
652
653 # get sizes of other widgets
654 for (@oth) {
655 my ($w, $h) = $_->size_request;
656 $oh += $h;
657 if ($ow < $w) { $ow = $w }
658 } 839 }
659 840
660 my $y = 0; 841 my $y = 0;
661 for (@{$self->{children}}) { 842 for (0 .. $#$children) {
662 $_->move (0, $y); 843 my $child = $children->[$_];
663 844 my $h = $h[$_];
664 if ($_ == $exp) {
665 $_->size_allocate ($w, $h - $oh);
666 $y += $h - $oh;
667 } else {
668 my ($cw, $h) = $_->size_request;
669 $_->size_allocate ($w, $h); 845 $child->size_allocate (0, $y, $w, $h);
846
670 $y += $h; 847 $y += $h;
671 }
672 } 848 }
673} 849}
674 850
675############################################################################# 851#############################################################################
676 852
677package CFClient::Widget::Label; 853package CFClient::UI::Label;
678 854
679our @ISA = CFClient::Widget::; 855our @ISA = CFClient::UI::Base::;
680 856
681use SDL::OpenGL; 857use SDL::OpenGL;
682 858
683sub new { 859sub new {
684 my ($class, %arg) = @_; 860 my ($class, %arg) = @_;
685 861
686 # TODO: color, and make height, xyz etc. optional
687 my $self = $class->SUPER::new ( 862 my $self = $class->SUPER::new (
688 color => [1, 1, 1], 863 fg => [1, 1, 1],
689 height => $::FONTSIZE, 864 height => $::FONTSIZE,
690 text => "", 865 text => "",
866 align => -1,
867 padding => 2,
691 layout => new CFClient::Layout, 868 layout => new CFClient::Layout,
692 %arg 869 %arg
693 ); 870 );
694 871
695 $self->set_text ($self->{text}); 872 $self->set_text ($self->{text});
696 873
697 $self 874 $self
698} 875}
699 876
877sub escape_text {
878 local $_ = $_[1];
879
880 s/&/&amp;/g;
881 s/>/&gt;/g;
882 s/</&lt;/g;
883
884 $_[1]
885}
886
700sub set_text { 887sub set_text {
701 my ($self, $text) = @_; 888 my ($self, $text) = @_;
702 889
703 $self->{text} = $text; 890 $self->{text} = $text;
704 $self->{layout}->set_markup ($text); 891 $self->{layout}->set_markup ($text);
705 892
706 delete $self->{texture}; 893 delete $self->{texture};
894 $self->update;
707} 895}
708 896
709sub get_text { 897sub get_text {
710 my ($self, $text) = @_; 898 my ($self, $text) = @_;
711 899
… …
715sub size_request { 903sub size_request {
716 my ($self) = @_; 904 my ($self) = @_;
717 905
718 $self->{layout}->set_width; 906 $self->{layout}->set_width;
719 $self->{layout}->set_height ($self->{height}); 907 $self->{layout}->set_height ($self->{height});
720 $self->{layout}->size 908 my ($w, $h) = $self->{layout}->size;
721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 909
722# ( 910 (
723# $self->{texture}{width}, 911 $w + $self->{padding} * 2,
724# $self->{texture}{height}, 912 $h + $self->{padding} * 2,
725# ) 913 )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
729# ($w, $h)
730# }
731} 914}
732 915
733sub size_allocate { 916sub size_allocate {
734 my ($self, $w, $h) = @_; 917 my ($self, $x, $y, $w, $h) = @_;
735 918
736 $self->SUPER::size_allocate ($w, $h); 919 $self->_size_allocate ($x, $y, $w, $h) or return;
920
737 delete $self->{texture}; 921 delete $self->{texture};
922}
923
924sub update {
925 my ($self) = @_;
926
927 delete $self->{texture};
928 $self->SUPER::update;
738} 929}
739 930
740sub _draw { 931sub _draw {
741 my ($self) = @_; 932 my ($self) = @_;
742 933
743 my $tex = $self->{texture} ||= do { 934 my $tex = $self->{texture} ||= do {
744 $self->{layout}->set_width ($self->{w}); 935 $self->{layout}->set_width ($self->{w});
745 new_from_layout CFClient::Texture $self->{layout}; 936 new_from_layout CFClient::Texture $self->{layout}
746 }; 937 };
747 938
748 glEnable GL_BLEND; 939 glEnable GL_BLEND;
940 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D; 941 glEnable GL_TEXTURE_2D;
750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 942 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
752 943
753 glColor @{$self->{color}}; 944 glColor @{$self->{fg}};
754 945
946 my $x =
947 $self->{align} < 0 ? $self->{padding}
948 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949 : ($self->{w} - $tex->{w}) * 0.5;
950
755 $tex->draw_quad (0, 0); 951 $tex->draw_quad ($x, 0);
756 952
953 glDisable GL_TEXTURE_2D;
757 glDisable GL_BLEND; 954 glDisable GL_BLEND;
758 glDisable GL_TEXTURE_2D;
759} 955}
760 956
761############################################################################# 957#############################################################################
762 958
763package CFClient::Widget::Entry; 959package CFClient::UI::Entry;
764 960
765our @ISA = CFClient::Widget::Label::; 961our @ISA = CFClient::UI::Label::;
766 962
767use SDL; 963use SDL;
768use SDL::OpenGL; 964use SDL::OpenGL;
769 965
966sub new {
967 my $class = shift;
968
969 $class->SUPER::new (
970 fg => [1, 1, 1],
971 bg => [0, 0, 0, 0.2],
972 active_bg => [1, 1, 1],
973 active_fg => [0, 0, 0],
974 @_
975 )
976}
977
978sub _set_text {
979 my ($self, $text) = @_;
980
981 $self->{last_activity} = $::NOW;
982
983 $self->{text} = $text;
984 $self->{layout}->set_width ($self->{w});
985
986 $text =~ s/./*/g if $self->{hidden};
987
988 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
989
990 $text = substr $text, 0, $self->{cursor};
991 utf8::encode $text;
992
993 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
994}
995
996sub size_request {
997 my ($self) = @_;
998
999 my ($w, $h) = $self->SUPER::size_request;
1000
1001 ($w + 1, $h) # add 1 for cursor
1002}
1003
1004sub size_allocate {
1005 my ($self, $x, $y, $w, $h) = @_;
1006
1007 $self->SUPER::size_allocate ($x, $y, $w, $h);
1008
1009 $self->_set_text ($self->{text});
1010}
1011
1012sub set_text {
1013 my ($self, $text) = @_;
1014
1015 $self->{cursor} = length $text;
1016 $self->_set_text ($text);
1017 $self->update;
1018}
1019
770sub key_down { 1020sub key_down {
771 my ($self, $ev) = @_; 1021 my ($self, $ev) = @_;
772 1022
773 my $mod = $ev->key_mod; 1023 my $mod = $ev->key_mod;
774 my $sym = $ev->key_sym; 1024 my $sym = $ev->key_sym;
… …
776 my $uni = $ev->key_unicode; 1026 my $uni = $ev->key_unicode;
777 1027
778 my $text = $self->get_text; 1028 my $text = $self->get_text;
779 1029
780 if ($sym == SDLK_BACKSPACE) { 1030 if ($sym == SDLK_BACKSPACE) {
781 substr $text, -1, 1, ''; 1031 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1032 } elsif ($sym == SDLK_DELETE) {
1033 substr $text, $self->{cursor}, 1, "";
1034 } elsif ($sym == SDLK_LEFT) {
1035 --$self->{cursor} if $self->{cursor};
1036 } elsif ($sym == SDLK_RIGHT) {
1037 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1038 } elsif ($sym == SDLK_HOME) {
1039 $self->{cursor} = 0;
1040 } elsif ($sym == SDLK_END) {
1041 $self->{cursor} = length $text;
782 } elsif ($uni) { 1042 } elsif ($uni) {
783 $text .= chr $uni; 1043 substr $text, $self->{cursor}++, 0, chr $uni;
784 } 1044 }
785 1045
786 $self->set_text ($text); 1046 $self->_set_text ($text);
1047 $self->update;
1048}
1049
1050sub focus_in {
1051 my ($self) = @_;
1052
1053 $self->{last_activity} = $::NOW;
1054
1055 $self->SUPER::focus_in;
787} 1056}
788 1057
789sub button_down { 1058sub button_down {
790 my ($self, $ev) = @_; 1059 my ($self, $ev, $x, $y) = @_;
791 1060
792 $self->focus_in; 1061 $self->SUPER::button_down ($ev, $x, $y);
1062
1063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1064
1065 # byte-index to char-index
1066 my $text = $self->{text};
1067 utf8::encode $text;
1068 $self->{cursor} = length substr $text, 0, $idx;
1069
1070 $self->_set_text ($self->{text});
1071 $self->update;
793} 1072}
794 1073
795sub mouse_motion { 1074sub mouse_motion {
796 my ($self, $ev, $x, $y) = @_; 1075 my ($self, $ev, $x, $y) = @_;
797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1076# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
798} 1077}
799 1078
800sub _draw { 1079sub _draw {
801 my ($self) = @_; 1080 my ($self) = @_;
802 1081
1082 local $self->{fg} = $self->{fg};
1083
803 if ($FOCUS == $self) { 1084 if ($FOCUS == $self) {
804 glColor 1, 1, 1; 1085 glColor @{$self->{active_bg}};
1086 $self->{fg} = $self->{active_fg};
805 } else { 1087 } else {
806 glColor 0.7, 0.7, 0.7; 1088 glColor @{$self->{bg}};
807 } 1089 }
808 1090
1091 glEnable GL_BLEND;
1092 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glBegin GL_QUADS; 1093 glBegin GL_QUADS;
810 glVertex 0 , 0; 1094 glVertex 0 , 0;
811 glVertex 0 , $self->{h} - 1; 1095 glVertex 0 , $self->{h};
812 glVertex $self->{w} - 1, $self->{h} - 1; 1096 glVertex $self->{w}, $self->{h};
813 glVertex $self->{w} - 1, 0; 1097 glVertex $self->{w}, 0;
814 glEnd; 1098 glEnd;
1099 glDisable GL_BLEND;
815 1100
816 $self->SUPER::_draw; 1101 $self->SUPER::_draw;
817}
818 1102
819############################################################################# 1103 #TODO: force update every cursor change :(
1104 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1105 glColor @{$self->{fg}};
1106 glBegin GL_LINES;
1107 glVertex $self->{cur_x}, $self->{cur_y};
1108 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1109 glEnd;
1110 }
1111}
820 1112
1113#############################################################################
1114
1115package CFClient::UI::Slider;
1116
1117use strict;
1118
1119use SDL::OpenGL;
1120
1121our @ISA = CFClient::UI::DrawBG::;
1122
1123sub new {
1124 my $class = shift;
1125
1126 # range [value, low, high, page]
1127
1128 my $self = $class->SUPER::new (
1129 fg => [1, 1, 1],
1130 active_fg => [0, 0, 0],
1131 range => [0, 0, 100, 10],
1132 req_w => 40,
1133 req_h => 10,
1134 vertical => 0,
1135 @_
1136 );
1137
1138 $self
1139}
1140
1141sub size_request {
1142 my ($self) = @_;
1143
1144 my $w = $self->{req_w};
1145 my $h = $self->{req_h};
1146
1147 $self->{vertical} ? ($h, $w) : ($w, $h)
1148}
1149
1150sub button_down {
1151 my ($self, $ev, $x, $y) = @_;
1152
1153 $self->SUPER::button_down ($ev, $x, $y);
1154 $self->mouse_motion ($ev, $x, $y);
1155}
1156
1157sub mouse_motion {
1158 my ($self, $ev, $x, $y) = @_;
1159
1160 if ($GRAB == $self) {
1161 my ($value, $lo, $hi, $page) = @{$self->{range}};
1162
1163 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1164
1165 $x = $x * ($hi - $lo) / $w + $lo;
1166 $x = $lo if $x < $lo;
1167 $x = $hi - $page if $x > $hi - $page;
1168 $self->{range}[0] = $x;
1169
1170 $self->emit (changed => $x);
1171 $self->update;
1172 }
1173}
1174
1175sub _draw {
1176 my ($self) = @_;
1177
1178 $self->SUPER::_draw ();
1179
1180 my ($w, $h) = @$self{qw(w h)};
1181
1182 if ($self->{vertical}) {
1183 # draw a vertical slider like a rotated horizontal slider
1184
1185 glRotate 90, 0, 0, 1;
1186 glTranslate 0, -$self->{w}, 0;
1187
1188 ($w, $h) = ($h, $w);
1189 }
1190
1191 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1192 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1193
1194 my ($value, $lo, $hi, $page) = @{$self->{range}};
1195
1196 $page = int $page * $w / ($hi - $lo);
1197 $value = int +($value - $lo) * $w / ($hi - $lo);
1198
1199 $w -= $page;
1200 $page &= ~1;
1201 glTranslate $page * 0.5, 0, 0;
1202
1203 glColor @$fg;
1204 glBegin GL_LINES;
1205 glVertex 0, 0; glVertex 0, $h;
1206 glVertex $w - 1, 0; glVertex $w - 1, $h;
1207 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1208 glEnd;
1209
1210 my $knob_a = $value - $page * 0.5;
1211 my $knob_b = $value + $page * 0.5;
1212
1213 glBegin GL_QUADS;
1214 glColor @$fg;
1215 glVertex $knob_a, 0;
1216 glVertex $knob_a, $h;
1217 glVertex $knob_b, $h;
1218 glVertex $knob_b, 0;
1219
1220 if ($knob_a < $knob_b - 2) {
1221 glColor @$bg;
1222 glVertex $knob_a + 1, 1;
1223 glVertex $knob_a + 1, $h - 1;
1224 glVertex $knob_b - 1, $h - 1;
1225 glVertex $knob_b - 1, 1;
1226 }
1227 glEnd;
1228}
1229
1230#############################################################################
1231
821package CFClient::Widget::MapWidget; 1232package CFClient::UI::MapWidget;
822 1233
823use strict; 1234use strict;
824 1235
825use List::Util qw(min max); 1236use List::Util qw(min max);
826 1237
827use SDL; 1238use SDL;
828use SDL::OpenGL; 1239use SDL::OpenGL;
829use SDL::OpenGL::Constants;
830 1240
831our @ISA = CFClient::Widget::; 1241our @ISA = CFClient::UI::Base::;
832 1242
833sub new { 1243sub new {
834 my $class = shift; 1244 my $class = shift;
835 1245
836 $class->SUPER::new ( 1246 $class->SUPER::new (
… …
856 1266
857sub update { 1267sub update {
858 my ($self) = @_; 1268 my ($self) = @_;
859 1269
860 $self->{need_update} = 1; 1270 $self->{need_update} = 1;
1271 $self->SUPER::update;
861} 1272}
862 1273
863sub _draw { 1274sub _draw {
864 my ($self) = @_; 1275 my ($self) = @_;
865 1276
… …
888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1299 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
889 } 1300 }
890 1301
891 glEnable GL_TEXTURE_2D; 1302 glEnable GL_TEXTURE_2D;
892 glEnable GL_BLEND; 1303 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894 1306
895 my $sw4 = ($sw + 3) & ~3; 1307 my $sw4 = ($sw + 3) & ~3;
896 my $darkness = "\x00" x ($sw4 * $sh); 1308 my $darkness = "\x00" x ($sw4 * $sh);
897 1309
… …
910 } 1322 }
911 1323
912 for my $num (grep $_, @$cell[1,2,3]) { 1324 for my $num (grep $_, @$cell[1,2,3]) {
913 my $tex = $::CONN->{face}[$num]{texture} || next; 1325 my $tex = $::CONN->{face}[$num]{texture} || next;
914 1326
915 my $w = $tex->{width}; 1327 my ($w, $h) = @$tex{qw(w h)};
916 my $h = $tex->{height};
917 1328
918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1329 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
919 } 1330 }
920 } 1331 }
921 } 1332 }
… …
928# 1339#
929# $lighting = $pb->get_pixels; 1340# $lighting = $pb->get_pixels;
930# $lighting =~ s/(.)../$1/gs; 1341# $lighting =~ s/(.)../$1/gs;
931# } 1342# }
932 1343
933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1344 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
935 1345
936 $darkness = new CFClient::Texture 1346 $darkness = new CFClient::Texture
937 width => $sw4, 1347 w => $sw4,
938 height => $sh, 1348 h => $sh,
939 data => $darkness, 1349 data => $darkness,
940 internalformat => GL_ALPHA, 1350 internalformat => GL_ALPHA,
941 format => GL_ALPHA; 1351 format => GL_ALPHA;
942 1352
943 glColor 0.45, 0.45, 0.45, 1; 1353 glColor 0.45, 0.45, 0.45, 1;
… …
1003 } 1413 }
1004} 1414}
1005 1415
1006############################################################################# 1416#############################################################################
1007 1417
1008package CFClient::Widget::Animator; 1418package CFClient::UI::Animator;
1009 1419
1010use SDL::OpenGL; 1420use SDL::OpenGL;
1011 1421
1012our @ISA = CFClient::Widget::Bin::; 1422our @ISA = CFClient::UI::Bin::;
1013 1423
1014sub moveto { 1424sub moveto {
1015 my ($self, $x, $y) = @_; 1425 my ($self, $x, $y) = @_;
1016 1426
1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1427 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1045 glPopMatrix; 1455 glPopMatrix;
1046} 1456}
1047 1457
1048############################################################################# 1458#############################################################################
1049 1459
1050package CFClient::Widget::Toplevel; 1460package CFClient::UI::Toplevel;
1051 1461
1052our @ISA = CFClient::Widget::Container::; 1462our @ISA = CFClient::UI::Container::;
1053 1463
1054sub size_request { 1464sub size_request {
1055 ($::WIDTH, $::HEIGHT) 1465 ($::WIDTH, $::HEIGHT)
1056} 1466}
1057 1467
1058sub size_allocate { 1468sub size_allocate {
1059 my ($self, $w, $h) = @_; 1469 my ($self, $x, $y, $w, $h) = @_;
1060 1470
1061 $self->SUPER::size_allocate ($w, $h); 1471 $self->_size_allocate ($x, $y, $w, $h);
1062 1472
1063 $_->size_allocate ($_->size_request) 1473 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1064 for @{$self->{children}}; 1474 for @{$self->{children}};
1065} 1475}
1066 1476
1067sub translate { 1477sub translate {
1068 my ($self, $x, $y) = @_; 1478 my ($self, $x, $y) = @_;
… …
1071} 1481}
1072 1482
1073sub update { 1483sub update {
1074 my ($self) = @_; 1484 my ($self) = @_;
1075 1485
1076 $self->size_allocate ($self->size_request); 1486 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1077 ::refresh (); 1487 ::refresh ();
1078} 1488}
1079 1489
1080sub add { 1490sub add {
1081 my ($self, $widget) = @_; 1491 my ($self, $widget) = @_;
1082 1492
1083 $self->SUPER::add ($widget); 1493 $self->SUPER::add ($widget);
1084 1494
1085 $widget->size_allocate ($widget->size_request); 1495 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1086} 1496}
1087 1497
1088sub draw { 1498sub draw {
1089 my ($self) = @_; 1499 my ($self) = @_;
1090 1500
1091 $self->_draw; 1501 $self->_draw;
1092} 1502}
1093 1503
1094############################################################################# 1504#############################################################################
1095 1505
1096package CFClient::Widget; 1506package CFClient::UI;
1097 1507
1098$TOPLEVEL = new CFClient::Widget::Toplevel; 1508$TOPLEVEL = new CFClient::UI::Toplevel;
1099 1509
11001 15101
1101 1511

Diff Legend

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