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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
183 } 189 }
184 } 190 }
185 191
186 reconfigure_widgets; 192 reconfigure_widgets;
187} 193}
196 202
197sub new { 203sub new {
198 my $class = shift; 204 my $class = shift;
199 205
200 my $self = bless { 206 my $self = bless {
201 x => 0, 207 x => "center",
202 y => 0, 208 y => "center",
203 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
204 can_events => 1, 212 can_events => 1,
205 @_ 213 @_
206 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 217
208 for (keys %$self) { 218 for (keys %$self) {
209 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
211 } 221 }
212 } 222 }
213 223
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
221 } 234 }
222 235
223 $self 236 $self
224} 237}
225 238
236 return if $self->{parent}; 249 return if $self->{parent};
237 250
238 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
239} 252}
240 253
241sub center {
242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible { 254sub set_visible {
254 my ($self) = @_; 255 my ($self) = @_;
255 256
256 return if $self->{visible}; 257 return if $self->{visible};
257 258
258 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
260 261
261 $self->emit (visibility_change => 1); 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
262} 267}
263 268
264sub set_invisible { 269sub set_invisible {
265 my ($self) = @_; 270 my ($self) = @_;
266 271
267 return unless $self->{visible}; 272 return unless $self->{visible};
268 273
269 # broken show/hide model 274 $_->set_invisible for $self->children;
270 275
271 delete $self->{root}; 276 delete $self->{root};
272 delete $self->{visible}; 277 delete $self->{visible};
273 278
274 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
275 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
276 281
277 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
278 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
279 284
280 $self->focus_out; 285 $self->focus_out;
281 286
282 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
283} 288}
306 311
307 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
308 if $self->{parent}; 313 if $self->{parent};
309} 314}
310 315
311sub move { 316sub move_abs {
312 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
313 318
314 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
315 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
316 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
317 322
318 $self->update; 323 $self->update;
319} 324}
320 325
321sub set_size { 326sub set_size {
322 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
323 328
324 $self->{def_w} = $w; 329 $self->{force_w} = $w;
325 $self->{def_h} = $h; 330 $self->{force_h} = $h;
326 331
327 $self->check_size; 332 $self->realloc;
328} 333}
329 334
330sub size_request { 335sub size_request {
331 require Carp; 336 require Carp;
332 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
334 339
335sub configure { 340sub configure {
336 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
337 342
338 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
339 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
340 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
341 348
342 # use alignment to adjust x, y 349 # use alignment to adjust x, y
343 350
344 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
345 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
346
347 ($w, $h) = ($w2, $h2);
348 } 353 }
349 354
350 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
351 $self->{x} = $x; 356 $self->{x} = $x;
352 $self->{y} = $y; 357 $self->{y} = $y;
353 $self->update; 358 $self->update;
354 } 359 }
355 360
356 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
358 } 368 }
359} 369}
360 370
361sub size_allocate { 371sub size_allocate {
362 # nothing to be done 372 # nothing to be done
363} 373}
364 374
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
372sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
373} 381}
374 382
375sub set_max_size { 383sub set_max_size {
376 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
377 385
436 444
437 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438 unless $FOCUS; 446 unless $FOCUS;
439} 447}
440 448
441sub mouse_motion { } 449sub mouse_motion { 0 }
442sub button_up { } 450sub button_up { 0 }
443sub key_down { } 451sub key_down { 0 }
444sub key_up { } 452sub key_up { 0 }
445 453
446sub button_down { 454sub button_down {
447 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
448 456
449 $self->focus_in; 457 $self->focus_in;
450}
451 458
452sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
453sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
454sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
455sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
456sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
457 535
458sub draw { 536sub draw {
459 my ($self) = @_; 537 my ($self) = @_;
460 538
461 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
462 550
463 glPushMatrix; 551 glPushMatrix;
464 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
465 $self->_draw; 553 $self->_draw;
466 glPopMatrix; 554 glPopMatrix;
478 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
479 glEnd; 567 glEnd;
480 glDisable GL_BLEND; 568 glDisable GL_BLEND;
481 } 569 }
482 570
483 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
484 glPushMatrix; 572 glPushMatrix;
485 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
487 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
488 glVertex 0 , 0; 576 glVertex 0 , 0;
499 my ($self) = @_; 587 my ($self) = @_;
500 588
501 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
502} 590}
503 591
504sub find_widget {
505 my ($self, $x, $y) = @_;
506
507 return () unless $self->{can_events};
508
509 return $self
510 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513 ()
514}
515
516sub set_parent {
517 my ($self, $parent) = @_;
518
519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
524}
525
526sub check_size {
527 my ($self, $forced) = @_;
528
529 $self->{force_alloc} = 1 if $forced;
530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
531}
532
533sub update {
534 my ($self) = @_;
535
536 $self->{parent}->update
537 if $self->{parent};
538}
539
540sub connect {
541 my ($self, $signal, $cb) = @_;
542
543 push @{ $self->{signal_cb}{$signal} }, $cb;
544}
545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
552sub emit {
553 my ($self, $signal, @args) = @_;
554
555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
561}
562
563sub DESTROY { 592sub DESTROY {
564 my ($self) = @_; 593 my ($self) = @_;
565 594
566 delete $WIDGET{$self+0}; 595 delete $WIDGET{$self+0};
567 #$self->deactivate; 596 #$self->deactivate;
623 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
624 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
625} 654}
626 655
627sub size_request { 656sub size_request {
628 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
629} 660}
630 661
631sub draw { } 662sub draw { }
632 663
633############################################################################# 664#############################################################################
637our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
638 669
639sub new { 670sub new {
640 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
641 672
642 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
643 674
644 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
645 children => [], 676 children => [],
646 can_events => 0, 677 can_events => 0,
647 %arg, 678 %arg,
648 ); 679 );
680
649 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
650 683
651 $self 684 $self
652} 685}
653 686
654sub add { 687sub add {
662 $self->{children} = [ 695 $self->{children} = [
663 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
664 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
665 ]; 698 ];
666 699
667 $self->check_size (1); 700 $self->realloc;
668 $self->update;
669} 701}
670 702
671sub children { 703sub children {
672 @{ $_[0]{children} } 704 @{ $_[0]{children} }
673} 705}
678 delete $child->{parent}; 710 delete $child->{parent};
679 $child->hide; 711 $child->hide;
680 712
681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682 714
683 $self->check_size (1); 715 $self->realloc;
684 $self->update;
685} 716}
686 717
687sub clear { 718sub clear {
688 my ($self) = @_; 719 my ($self) = @_;
689 720
693 for (@$children) { 724 for (@$children) {
694 delete $_->{parent}; 725 delete $_->{parent};
695 $_->hide; 726 $_->hide;
696 } 727 }
697 728
698 $self->check_size; 729 $self->realloc;
699 $self->update;
700} 730}
701 731
702sub find_widget { 732sub find_widget {
703 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
704 734
705 $x -= $self->{x}; 735 $x -= $self->{x};
706 $y -= $self->{y}; 736 $y -= $self->{y};
707 737
708 my $res; 738 my $res;
709 739
710 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
711 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
712 and return $res; 742 and return $res;
713 } 743 }
714 744
715 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
764 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
765} 795}
766 796
767############################################################################# 797#############################################################################
768 798
799# back-buffered drawing area
800
769package CFClient::UI::Window; 801package CFClient::UI::Window;
770 802
771our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
772 804
773use CFClient::OpenGL; 805use CFClient::OpenGL;
791 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
792 $self->update; 824 $self->update;
793} 825}
794 826
795sub _render { 827sub _render {
828 my ($self) = @_;
829
796 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
797} 831}
798 832
799sub render_child { 833sub render_child {
800 my ($self) = @_; 834 my ($self) = @_;
801 835
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
805 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
806 $self->_render; 847 $self->_render;
807 }; 848 };
808} 849}
809 850
810sub _draw { 851sub _draw {
811 my ($self) = @_; 852 my ($self) = @_;
812 853
813 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
814 855
815 my $tex = $self->{texture} 856 my $tex = $self->{texture}
816 or return; 857 or return;
817 858
818 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
841} 882}
842 883
843sub size_request { 884sub size_request {
844 my ($self) = @_; 885 my ($self) = @_;
845 886
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 888
848 $w = 10 if $self->{scroll_x}; 889 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 890 $h = 10 if $self->{scroll_y};
850 891
851 ($w, $h) 892 ($w, $h)
852} 893}
853 894
854sub size_allocate { 895sub size_allocate {
855 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
856 897
898 my $child = $self->child;
899
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 902
860 $self->child->configure (0, 0, $w, $h); 903 $self->child->configure (0, 0, $w, $h);
861 $self->update; 904 $self->update;
862} 905}
863 906
899} 942}
900 943
901sub _render { 944sub _render {
902 my ($self) = @_; 945 my ($self) = @_;
903 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 951
906 $self->SUPER::_render; 952 $self->SUPER::_render;
907} 953}
908 954
911package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
912 958
913our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
914 960
915sub new { 961sub new {
916 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
917 965
918 my $self; 966 my $self;
919 967
920 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
921 vertical => 1, 969 vertical => 1,
926 ; 974 ;
927 975
928 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 978 slider => $slider,
931 @_, 979 %arg,
932 ); 980 );
933 981
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
937 984
938 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
939} 992}
940 993
941sub update { 994sub update {
942 my ($self) = @_; 995 my ($self) = @_;
943 996
1006 1059
1007our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
1008 1061
1009use CFClient::OpenGL; 1062use CFClient::OpenGL;
1010 1063
1011my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1071
1015sub new { 1072sub new {
1016 my $class = shift; 1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1017 1076
1018 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1080 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1081 can_events => 1,
1024 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
1025 ); 1085 );
1026 1086
1027 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
1028 align => 0, 1088 align => 0,
1029 valign => 1, 1089 valign => 1,
1030 text => $self->{title}, 1090 text => $title,
1031 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
1032 1093
1033 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034} 1102}
1035 1103
1036sub border { 1104sub border {
1037 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
1038} 1106}
1039 1107
1040sub size_request { 1108sub size_request {
1041 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
1042 1113
1043 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
1044 1115
1045 ( 1116 (
1046 $w + $self->border * 2, 1117 $w + $self->border * 2,
1049} 1120}
1050 1121
1051sub size_allocate { 1122sub size_allocate {
1052 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
1053 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
1054 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
1056 1135
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
1061} 1137}
1062 1138
1063sub button_down { 1139sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1065 1141
1081 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
1082 1158
1083 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
1085 1161
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1164
1091 $self->check_size; 1165 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 }; 1167 };
1093 1168
1094 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
1098 $self->{motion} = sub { 1173 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1100 1175
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1177
1103 $self->{user_x} = $bx + $x - $ox; 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->update;
1108 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
1109 } 1184 1
1110} 1185}
1111 1186
1112sub button_up { 1187sub button_up {
1113 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
1114 1189
1115 delete $self->{motion}; 1190 !!delete $self->{motion}
1116} 1191}
1117 1192
1118sub mouse_motion { 1193sub mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
1120 1195
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
1122} 1199}
1123 1200
1124sub _draw { 1201sub _draw {
1125 my ($self) = @_; 1202 my ($self) = @_;
1126 1203
1204 my $child = $self->{children}[0];
1205
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1208
1130 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1211
1133 my $border = $self->border; 1212 my $border = $self->border;
1134 1213
1135 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140 1219
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
1143 1222
1144 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
1145 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
1146 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
1147
1148 glColor @{ $self->{bg} };
1149
1150 $bg->{s} = $rep_x;
1151 $bg->{t} = $rep_y;
1152 $bg->{wrap_mode} = 1;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1228 }
1155 1229
1156 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1157 1231
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1161} 1238}
1162 1239
1163############################################################################# 1240#############################################################################
1164 1241
1165package CFClient::UI::Table; 1242package CFClient::UI::Table;
1187 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1188 1265
1189 $child->set_parent ($self); 1266 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1191 1268
1192 $self->check_size (1); 1269 $self->realloc;
1193} 1270}
1194 1271
1195# TODO: move to container class maybe? send children a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1273sub clear {
1197 my ($self) = @_; 1274 my ($self) = @_;
1202 for (@children) { 1279 for (@children) {
1203 delete $_->{parent}; 1280 delete $_->{parent};
1204 $_->hide; 1281 $_->hide;
1205 } 1282 }
1206 1283
1207 $self->check_size (1); 1284 $self->realloc;
1208 $self->update;
1209} 1285}
1210 1286
1211sub get_wh { 1287sub get_wh {
1212 my ($self) = @_; 1288 my ($self) = @_;
1213 1289
1421 ellipsise => 3, # end 1497 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1423 fontsize => 1, 1499 fontsize => 1,
1424 align => -1, 1500 align => -1,
1425 valign => -1, 1501 valign => -1,
1426 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1427 can_events => 0, 1504 can_events => 0,
1428 %arg 1505 %arg
1429 ); 1506 );
1430 1507
1431 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
1467 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1468 1545
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1471 1548
1549 $self->realloc;
1472 $self->update; 1550 $self->update;
1473 $self->check_size;
1474} 1551}
1475 1552
1476sub set_markup { 1553sub set_markup {
1477 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1478 1555
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1560
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1486 1563
1564 $self->realloc;
1487 $self->update; 1565 $self->update;
1488 $self->check_size;
1489} 1566}
1490 1567
1491sub size_request { 1568sub size_request {
1492 my ($self) = @_; 1569 my ($self) = @_;
1493 1570
1507 1584
1508 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1510 } 1587 }
1511 1588
1512 ( 1589 ($w, $h)
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1590}
1517 1591
1518sub size_allocate { 1592sub size_allocate {
1519 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1520 1594
1595 delete $self->{ox};
1596
1521 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1599}
1523 1600
1524sub set_fontsize { 1601sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1526 1603
1527 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1605 delete $self->{texture};
1529 1606
1530 $self->update; 1607 $self->realloc;
1531 $self->check_size;
1532} 1608}
1533 1609
1534sub _draw { 1610sub _draw {
1535 my ($self) = @_; 1611 my ($self) = @_;
1536 1612
1542 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1622
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1548 1625
1626 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1552 1630
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1634 };
1559 1635
1560 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 1638
1616sub set_text { 1692sub set_text {
1617 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1618 1694
1619 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1696 $self->_set_text ($text);
1621 $self->update; 1697
1622 $self->check_size; 1698 $self->realloc;
1623} 1699}
1624 1700
1625sub get_text { 1701sub get_text {
1626 $_[0]{text} 1702 $_[0]{text}
1627} 1703}
1657 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1660 } elsif ($uni) { 1736 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1662 } 1740 }
1663 1741
1664 $self->_set_text ($text); 1742 $self->_set_text ($text);
1665 $self->update; 1743
1666 $self->check_size; 1744 $self->realloc;
1745
1746 1
1667} 1747}
1668 1748
1669sub focus_in { 1749sub focus_in {
1670 my ($self) = @_; 1750 my ($self) = @_;
1671 1751
1686 utf8::encode $text; 1766 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1688 1768
1689 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1690 $self->update; 1770 $self->update;
1771
1772 1
1691} 1773}
1692 1774
1693sub mouse_motion { 1775sub mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1696} 1780}
1697 1781
1698sub _draw { 1782sub _draw {
1699 my ($self) = @_; 1783 my ($self) = @_;
1700 1784
1777 } else { 1861 } else {
1778 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1779 } 1863 }
1780 1864
1781 } else { 1865 } else {
1782 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1783 } 1869 1
1784
1785} 1870}
1786 1871
1787############################################################################# 1872#############################################################################
1788 1873
1789package CFClient::UI::Button; 1874package CFClient::UI::Button;
1798 1883
1799sub new { 1884sub new {
1800 my $class = shift; 1885 my $class = shift;
1801 1886
1802 $class->SUPER::new ( 1887 $class->SUPER::new (
1803 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1804 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1806 can_hover => 1, 1892 can_hover => 1,
1807 align => 0, 1893 align => 0,
1808 valign => 0, 1894 valign => 0,
1817 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1818 1904
1819 $self->emit ("activate") 1905 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1822} 1910}
1823 1911
1824sub _draw { 1912sub _draw {
1825 my ($self) = @_; 1913 my ($self) = @_;
1826 1914
1855 1943
1856sub new { 1944sub new {
1857 my $class = shift; 1945 my $class = shift;
1858 1946
1859 $class->SUPER::new ( 1947 $class->SUPER::new (
1860 padding => 2, 1948 padding_x => 2,
1949 padding_y => 2,
1861 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1951 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1952 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1953 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1954 state => 0,
1869} 1958}
1870 1959
1871sub size_request { 1960sub size_request {
1872 my ($self) = @_; 1961 my ($self) = @_;
1873 1962
1874 ($self->{padding} * 2 + 6) x 2 1963 (6) x 2
1875} 1964}
1876 1965
1877sub button_down { 1966sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1879 1968
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1884 } 1977 1
1885} 1978}
1886 1979
1887sub _draw { 1980sub _draw {
1888 my ($self) = @_; 1981 my ($self) = @_;
1889 1982
1890 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1891 1984
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1985 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 1986
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1987 my ($w, $h) = @$self{qw(w h)};
1988
1989 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 1990
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1991 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 1992
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1993 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 1994
2164 fg => [1, 1, 1], 2259 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2260 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2261 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2262 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2263 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2264 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2265 min_h => $::WIDTH / 80,
2171 vertical => 0, 2266 vertical => 0,
2172 can_hover => 1, 2267 can_hover => 1,
2173 inner_pad => 0.02, 2268 inner_pad => 0.02,
2174 @_ 2269 @_
2175 ); 2270 );
2178 $self->update; 2273 $self->update;
2179 2274
2180 $self 2275 $self
2181} 2276}
2182 2277
2278sub changed { }
2279
2183sub set_range { 2280sub set_range {
2184 my ($self, $range) = @_; 2281 my ($self, $range) = @_;
2185 2282
2186 ($range, $self->{range}) = ($self->{range}, $range); 2283 ($range, $self->{range}) = ($self->{range}, $range);
2187 2284
2213} 2310}
2214 2311
2215sub size_request { 2312sub size_request {
2216 my ($self) = @_; 2313 my ($self) = @_;
2217 2314
2218 my $w = $self->{req_w}; 2315 ($self->{req_w}, $self->{req_h})
2219 my $h = $self->{req_h};
2220
2221 $self->{vertical} ? ($h, $w) : ($w, $h)
2222} 2316}
2223 2317
2224sub button_down { 2318sub button_down {
2225 my ($self, $ev, $x, $y) = @_; 2319 my ($self, $ev, $x, $y) = @_;
2226 2320
2227 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2228 2322
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230 2324
2231 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2232} 2326}
2233 2327
2234sub mouse_motion { 2328sub mouse_motion {
2235 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2236 2330
2240 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241 2335
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243 2337
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2245 } 2343 1
2246} 2344}
2247 2345
2248sub update { 2346sub update {
2249 my ($self) = @_; 2347 my ($self) = @_;
2250 2348
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2349 delete $self->{knob_w};
2350 $self->SUPER::update;
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 unless ($self->{knob_w}) {
2252 $self->set_value ($self->{range}[0]); 2357 $self->set_value ($self->{range}[0]);
2253 2358
2254 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2359 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100; 2360 my $range = ($hi - $page - $lo) || 1e-100;
2256 2361
2262 $value = ($value - $lo) / $range; 2367 $value = ($value - $lo) / $range;
2263 $value = $value * $self->{scale} + $self->{offset}; 2368 $value = $value * $self->{scale} + $self->{offset};
2264 2369
2265 $self->{knob_x} = $value - $knob_w * 0.5; 2370 $self->{knob_x} = $value - $knob_w * 0.5;
2266 $self->{knob_w} = $knob_w; 2371 $self->{knob_w} = $knob_w;
2267 }); 2372 }
2268
2269 $self->SUPER::update;
2270}
2271
2272sub _draw {
2273 my ($self) = @_;
2274 2373
2275 $self->SUPER::_draw (); 2374 $self->SUPER::_draw ();
2276 2375
2277 glScale $self->{w}, $self->{h}; 2376 glScale $self->{w}, $self->{h};
2278 2377
2611} 2710}
2612 2711
2613sub set_tooltip_from { 2712sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2713 my ($self, $widget) = @_;
2615 2714
2715 my $tooltip = $widget->{tooltip};
2716
2717 if ($ENV{CFPLUS_DEBUG} & 2) {
2718 $tooltip .= "\n\n" . (ref $widget) . "\n"
2719 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2720 . "req $widget->{req_w} $widget->{req_h}\n"
2721 . "visible $widget->{visible}";
2722 }
2723
2616 $self->add (new CFClient::UI::Label 2724 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2725 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2726 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2727 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2728 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2729 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2730 font => ($widget->{tooltip_font} || $::FONT_PROP),
2633 2741
2634sub size_allocate { 2742sub size_allocate {
2635 my ($self, $w, $h) = @_; 2743 my ($self, $w, $h) = @_;
2636 2744
2637 $self->SUPER::size_allocate ($w - 4, $h - 4); 2745 $self->SUPER::size_allocate ($w - 4, $h - 4);
2746}
2747
2748sub visibility_change {
2749 my ($self, $visible) = @_;
2750
2751 return unless $visible;
2752
2753 $self->{root}->on_post_alloc ("move_$self" => sub {
2754 my $widget = $self->{owner}
2755 or return;
2756
2757 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2758
2759 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2760 if $x + $self->{w} > $::WIDTH;
2761
2762 $self->move_abs ($x, $y);
2763 });
2638} 2764}
2639 2765
2640sub _draw { 2766sub _draw {
2641 my ($self) = @_; 2767 my ($self) = @_;
2642 2768
2659 glVertex $w, $h; 2785 glVertex $w, $h;
2660 glVertex $w, 0; 2786 glVertex $w, 0;
2661 glEnd; 2787 glEnd;
2662 2788
2663 glTranslate 2 - 0.375, 2 - 0.375; 2789 glTranslate 2 - 0.375, 2 - 0.375;
2790
2664 $self->SUPER::_draw; 2791 $self->SUPER::_draw;
2665} 2792}
2666 2793
2667############################################################################# 2794#############################################################################
2668 2795
2744 $self->SUPER::DESTROY; 2871 $self->SUPER::DESTROY;
2745} 2872}
2746 2873
2747############################################################################# 2874#############################################################################
2748 2875
2749package CFClient::UI::Inventory; 2876package CFClient::UI::Buttonbar;
2750 2877
2751our @ISA = CFClient::UI::ScrolledWindow::; 2878our @ISA = CFClient::UI::HBox::;
2752 2879
2753sub new { 2880# TODO: should actualyl wrap buttons and other goodies.
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2786 }
2787}
2788 2881
2789############################################################################# 2882#############################################################################
2790 2883
2791package CFClient::UI::Menu; 2884package CFClient::UI::Menu;
2792 2885
2833 # maybe save $GRAB? must be careful about events... 2926 # maybe save $GRAB? must be careful about events...
2834 $GRAB = $self; 2927 $GRAB = $self;
2835 $self->{button} = $ev->{button}; 2928 $self->{button} = $ev->{button};
2836 2929
2837 $self->show; 2930 $self->show;
2838 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2931 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839} 2932}
2840 2933
2841sub mouse_motion { 2934sub mouse_motion {
2842 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2843 2936
2844 # TODO: should use vbox->find_widget or so 2937 # TODO: should use vbox->find_widget or so
2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846 $self->{hover} = $self->{item}{$HOVER}; 2939 $self->{hover} = $self->{item}{$HOVER};
2940
2941 0
2847} 2942}
2848 2943
2849sub button_up { 2944sub button_up {
2850 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2851 2946
2853 undef $GRAB; 2948 undef $GRAB;
2854 $self->hide; 2949 $self->hide;
2855 2950
2856 $self->_emit ("popdown"); 2951 $self->_emit ("popdown");
2857 $self->{hover}[1]->() if $self->{hover}; 2952 $self->{hover}[1]->() if $self->{hover};
2953 } else {
2954 return 0
2955 }
2956
2957 1
2958}
2959
2960#############################################################################
2961
2962package CFClient::UI::Multiplexer;
2963
2964our @ISA = CFClient::UI::Container::;
2965
2966sub new {
2967 my $class = shift;
2968
2969 my $self = $class->SUPER::new (
2970 @_,
2971 );
2972
2973 $self->{current} = $self->{children}[0]
2974 if @{ $self->{children} };
2975
2976 $self
2977}
2978
2979sub add {
2980 my ($self, @widgets) = @_;
2981
2982 $self->SUPER::add (@widgets);
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986}
2987
2988sub set_current_page {
2989 my ($self, $page_or_widget) = @_;
2990
2991 my $widget = ref $page_or_widget
2992 ? $page_or_widget
2993 : $self->{children}[$page_or_widget];
2994
2995 $self->{current} = $widget;
2996 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2997
2998 $self->_emit (page_changed => $self->{current});
2999
3000 $self->realloc;
3001}
3002
3003sub visible_children {
3004 $_[0]{current}
3005}
3006
3007sub size_request {
3008 my ($self) = @_;
3009
3010 $self->{current}->size_request
3011}
3012
3013sub size_allocate {
3014 my ($self, $w, $h) = @_;
3015
3016 $self->{current}->configure (0, 0, $w, $h);
3017}
3018
3019sub _draw {
3020 my ($self) = @_;
3021
3022 $self->{current}->draw;
3023}
3024
3025#############################################################################
3026
3027package CFClient::UI::Notebook;
3028
3029our @ISA = CFClient::UI::VBox::;
3030
3031sub new {
3032 my $class = shift;
3033
3034 my $self = $class->SUPER::new (
3035 buttonbar => (new CFClient::UI::Buttonbar),
3036 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3037 # filter => # will be put between multiplexer and $self
3038 @_,
3039 );
2858 } 3040
3041 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3042 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3043
3044 $self
3045}
3046
3047sub add {
3048 my ($self, $title, $widget, $tooltip) = @_;
3049
3050 Scalar::Util::weaken $self;
3051
3052 $self->{buttonbar}->add (new CFClient::UI::Button
3053 markup => $title,
3054 tooltip => $tooltip,
3055 on_activate => sub { $self->set_current_page ($widget) },
3056 );
3057
3058 $self->{multiplexer}->add ($widget);
3059}
3060
3061sub set_current_page {
3062 my ($self, $page) = @_;
3063
3064 $self->{multiplexer}->set_current_page ($page);
3065 $self->_emit (page_changed => $self->{multiplexer}{current});
2859} 3066}
2860 3067
2861############################################################################# 3068#############################################################################
2862 3069
2863package CFClient::UI::Statusbox; 3070package CFClient::UI::Statusbox;
2968 $self->SUPER::reconfigure; 3175 $self->SUPER::reconfigure;
2969} 3176}
2970 3177
2971############################################################################# 3178#############################################################################
2972 3179
2973package CFClient::UI::Root; 3180package CFClient::UI::Inventory;
2974 3181
2975our @ISA = CFClient::UI::Container::; 3182our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977use CFClient::OpenGL;
2978 3183
2979sub new { 3184sub new {
2980 my $class = shift; 3185 my $class = shift;
2981 3186
2982 $class->SUPER::new ( 3187 my $self = $class->SUPER::new (
3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3189 @_,
3190 );
3191
3192 $self
3193}
3194
3195sub set_items {
3196 my ($self, $items) = @_;
3197
3198 $self->{child}->clear;
3199 return unless $items;
3200
3201 my @items = sort {
3202 ($a->{type} <=> $b->{type})
3203 or ($a->{name} cmp $b->{name})
3204 } @$items;
3205
3206 $self->{real_items} = \@items;
3207
3208 my $row = 0;
3209 for my $item (@items) {
3210 CFClient::Item::update_widgets $item;
3211
3212 $self->{child}->add (0, $row, $item->{face_widget});
3213 $self->{child}->add (1, $row, $item->{desc_widget});
3214 $self->{child}->add (2, $row, $item->{weight_widget});
3215
3216 $row++;
3217 }
3218}
3219
3220#############################################################################
3221
3222package CFClient::UI::BindEditor;
3223
3224our @ISA = CFClient::UI::FancyFrame::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3230
3231 $self->add (my $vb = new CFClient::UI::VBox);
3232
3233
3234 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3235 text => "start recording",
3236 tooltip => "Start/Stops recording of actions."
3237 ."All subsequent actions after the recording started will be captured."
3238 ."The actions are displayed after the record was stopped."
3239 ."To bind the action you have to click on the 'Bind' button",
3240 on_activate => sub {
3241 unless ($self->{recording}) {
3242 $self->start;
3243 } else {
3244 $self->stop;
3245 }
3246 });
3247
3248 $vb->add (new CFClient::UI::Label text => "Actions:");
3249 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3250
3251 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3252 $vb->add (my $hb = new CFClient::UI::HBox);
3253 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3254 $hb->add (new CFClient::UI::Button
3255 text => "bind",
3256 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3257 on_activate => sub {
3258 $self->ask_for_bind;
3259 });
3260
3261 $vb->add (my $hb = new CFClient::UI::HBox);
3262 $hb->add (new CFClient::UI::Button
3263 text => "ok",
3264 expand => 1,
3265 tooltip => "This closes the binding editor and saves the binding",
3266 on_activate => sub {
3267 $self->hide;
3268 $self->commit;
3269 });
3270
3271 $hb->add (new CFClient::UI::Button
3272 text => "cancel",
3273 expand => 1,
3274 tooltip => "This closes the binding editor without saving",
3275 on_activate => sub {
3276 $self->hide;
3277 $self->{binding_cancel}->()
3278 if $self->{binding_cancel};
3279 });
3280
3281 $self->update_binding_widgets;
3282
3283 $self
3284}
3285
3286sub commit {
3287 my ($self) = @_;
3288 my ($mod, $sym, $cmds) = $self->get_binding;
3289 if ($sym != 0 && @$cmds > 0) {
3290 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3291 ."'. Don't forget 'Save Config'!");
3292 $self->{binding_change}->($mod, $sym, $cmds)
3293 if $self->{binding_change};
3294 } else {
3295 $::STATUSBOX->add ("No action bound, no key or action specified!");
3296 $self->{binding_cancel}->()
3297 if $self->{binding_cancel};
3298 }
3299}
3300
3301sub start {
3302 my ($self) = @_;
3303
3304 $self->{rec_btn}->set_text ("stop recording");
3305 $self->{recording} = 1;
3306 $self->clear_command_list;
3307 $::CONN->start_record if $::CONN;
3308}
3309
3310sub stop {
3311 my ($self) = @_;
3312
3313 $self->{rec_btn}->set_text ("start recording");
3314 $self->{recording} = 0;
3315
3316 my $rec;
3317 $rec = $::CONN->stop_record if $::CONN;
3318 return unless ref $rec eq 'ARRAY';
3319 $self->set_command_list ($rec);
3320}
3321
3322
3323sub ask_for_bind_and_commit {
3324 my ($self) = @_;
3325 $self->ask_for_bind (1);
3326}
3327
3328sub ask_for_bind {
3329 my ($self, $commit) = @_;
3330
3331 CFClient::Binder::open_binding_dialog (sub {
3332 my ($mod, $sym) = @_;
3333 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3334 $self->update_binding_widgets;
3335 $self->commit if $commit;
3336 });
3337}
3338
3339# $mod and $sym are the modifiers and key symbol
3340# $cmds is a array ref of strings (the commands)
3341# $cb is the callback that is executed on OK
3342# $ccb is the callback that is executed on CANCEL and
3343# when the binding was unsuccessful on OK
3344sub set_binding {
3345 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3346
3347 $self->clear_command_list;
3348 $self->{recording} = 0;
3349 $self->{rec_btn}->set_text ("start recording");
3350
3351 $self->{binding} = [$mod, $sym];
3352 $self->{commands} = $cmds;
3353
3354 $self->{binding_change} = $cb;
3355 $self->{binding_cancel} = $ccb;
3356
3357 $self->update_binding_widgets;
3358}
3359
3360# this is a shortcut method that asks for a binding
3361# and then just binds it.
3362sub do_quick_binding {
3363 my ($self, $cmds) = @_;
3364 $self->set_binding (undef, undef, $cmds, sub {
3365 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3366 });
3367 $self->ask_for_bind (1);
3368}
3369
3370sub update_binding_widgets {
3371 my ($self) = @_;
3372 my ($mod, $sym, $cmds) = $self->get_binding;
3373 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3374 $self->set_command_list ($cmds);
3375}
3376
3377sub get_binding {
3378 my ($self) = @_;
3379 return (
3380 $self->{binding}->[0],
3381 $self->{binding}->[1],
3382 [ grep { defined $_ } @{$self->{commands}} ]
3383 );
3384}
3385
3386sub clear_command_list {
3387 my ($self) = @_;
3388 $self->{cmdbox}->clear ();
3389}
3390
3391sub set_command_list {
3392 my ($self, $cmds) = @_;
3393
3394 $self->{cmdbox}->clear ();
3395 $self->{commands} = $cmds;
3396
3397 my $idx = 0;
3398
3399 for (@$cmds) {
3400 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3401
3402 my $i = $idx;
3403 $hb->add (new CFClient::UI::Label text => $_);
3404 $hb->add (new CFClient::UI::Button
3405 text => "delete",
3406 tooltip => "Deletes the action from the record",
3407 on_activate => sub {
3408 $self->{cmdbox}->remove ($hb);
3409 $cmds->[$i] = undef;
3410 });
3411
3412
3413 $idx++
3414 }
3415}
3416
3417#############################################################################
3418
3419package CFClient::UI::SpellList;
3420
3421our @ISA = CFClient::UI::Table::;
3422
3423sub new {
3424 my $class = shift;
3425
3426 my $self = $class->SUPER::new (
3427 binding => [],
3428 commands => [],
3429 @_,
3430 )
3431}
3432
3433# XXX: Do sorting? Argl...
3434sub add_spell {
3435 my ($self, $spell) = @_;
3436 $self->{spells}->{$spell->{name}} = $spell;
3437
3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3439 face => $spell->{face},
3440 can_hover => 1,
3441 can_events => 1,
3442 tooltip => $spell->{message});
3443
3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3445 text => $spell->{name},
3446 can_hover => 1,
3447 can_events => 1,
3448 tooltip => $spell->{message},
3449 expand => 1);
3450
3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3454 expand => 1);
3455
3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3457 text => "bind to key",
3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3459}
3460
3461sub rebuild_spell_list {
3462 my ($self) = @_;
3463 $self->{tbl_idx} = 0;
3464 $self->add_spell ($_) for values %{$self->{spells}};
3465}
3466
3467sub remove_spell {
3468 my ($self, $spell) = @_;
3469 delete $self->{spells}->{$spell->{name}};
3470 $self->rebuild_spell_list;
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::Root;
3476
3477our @ISA = CFClient::UI::Container::;
3478
3479use CFClient::OpenGL;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
2983 visible => 1, 3485 visible => 1,
2984 @_, 3486 @_,
2985 ) 3487 );
2986}
2987 3488
2988sub configure { 3489 Scalar::Util::weaken ($self->{root} = $self);
2989 my ($self, $x, $y, $w, $h) = @_;
2990 3490
2991 $self->{w} = $w; 3491 $self
2992 $self->{h} = $h;
2993}
2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000} 3492}
3001 3493
3002sub size_request { 3494sub size_request {
3003 my ($self) = @_; 3495 my ($self) = @_;
3004 3496
3005 ($self->{w}, $self->{h}) 3497 ($self->{w}, $self->{h})
3498}
3499
3500sub _to_pixel {
3501 my ($coord, $size, $max) = @_;
3502
3503 $coord =
3504 $coord eq "center" ? ($max - $size) * 0.5
3505 : $coord eq "max" ? $max
3506 : $coord;
3507
3508 $coord = 0 if $coord < 0;
3509 $coord = $max - $size if $coord > $max - $size;
3510
3511 int $coord + 0.5
3006} 3512}
3007 3513
3008sub size_allocate { 3514sub size_allocate {
3009 my ($self, $w, $h) = @_; 3515 my ($self, $w, $h) = @_;
3010 3516
3011 for my $child ($self->children) { 3517 for my $child ($self->children) {
3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3518 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013 3519
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3520 $X = $child->{force_x} if exists $child->{force_x};
3015 if exists $child->{req_x}; 3521 $Y = $child->{force_y} if exists $child->{force_y};
3016 3522
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3523 $X = _to_pixel $X, $W, $self->{w};
3018 if exists $child->{req_y}; 3524 $Y = _to_pixel $Y, $H, $self->{h};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024 3525
3025 $child->configure ($X, $Y, $W, $H); 3526 $child->configure ($X, $Y, $W, $H);
3026 } 3527 }
3027} 3528}
3028 3529
3039} 3540}
3040 3541
3041sub update { 3542sub update {
3042 my ($self) = @_; 3543 my ($self) = @_;
3043 3544
3044 $self->check_size;
3045 $::WANT_REFRESH++; 3545 $::WANT_REFRESH++;
3046} 3546}
3047 3547
3048sub add { 3548sub add {
3049 my ($self, @children) = @_; 3549 my ($self, @children) = @_;
3050 3550
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1; 3551 $_->{is_toplevel} = 1
3053 3552 for @children;
3054 # integerise window positions
3055 $child->{x} = int $child->{x};
3056 $child->{y} = int $child->{y};
3057 }
3058 3553
3059 $self->SUPER::add (@children); 3554 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066} 3555}
3067 3556
3068sub remove { 3557sub remove {
3069 my ($self, @children) = @_; 3558 my ($self, @children) = @_;
3070 3559
3071 $self->SUPER::remove (@children); 3560 $self->SUPER::remove (@children);
3561
3562 delete $self->{is_toplevel}
3563 for @children;
3072 3564
3073 while (@children) { 3565 while (@children) {
3074 my $w = pop @children; 3566 my $w = pop @children;
3075 push @children, $w->children; 3567 push @children, $w->children;
3076 $w->set_invisible; 3568 $w->set_invisible;
3095 while ($self->{refresh_hook}) { 3587 while ($self->{refresh_hook}) {
3096 $_->() 3588 $_->()
3097 for values %{delete $self->{refresh_hook}}; 3589 for values %{delete $self->{refresh_hook}};
3098 } 3590 }
3099 3591
3100 if ($self->{check_size}) { 3592 if ($self->{realloc}) {
3593 my %queue;
3101 my @queue; 3594 my @queue;
3595 my $widget;
3102 3596
3597 outer:
3103 while () { 3598 while () {
3104 if ($self->{check_size}) { 3599 if (my $realloc = delete $self->{realloc}) {
3105 #TODO use array-of-depth approach 3600 for $widget (values %$realloc) {
3601 $widget->{visible} or next; # do not resize invisible widgets
3106 3602
3107 @queue = sort { $a->{visible} <=> $b->{visible} } 3603 $queue{$widget+0}++ and next; # duplicates are common
3108 @queue, values %{delete $self->{check_size}}; 3604
3605 push @{ $queue[$widget->{visible}] }, $widget;
3606 }
3109 } 3607 }
3110 3608
3609 while () {
3610 @queue or last outer;
3611
3111 my $widget = pop @queue || last; 3612 $widget = pop @{ $queue[-1] || [] }
3112 3613 and last;
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122 3614
3615 pop @queue;
3616 }
3617
3618 delete $queue{$widget+0};
3619
3620 my ($w, $h) = $widget->size_request;
3621
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3624
3625 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h};
3627
3628 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3629 || delete $widget->{force_realloc}) {
3123 $widget->{req_w} = $w; 3630 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h; 3631 $widget->{req_h} = $h;
3125 3632
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3633 $self->{size_alloc}{$widget+0} = $widget;
3127 3634
3128 $widget->{parent}->check_size
3129 if $widget->{parent}; 3635 if (my $parent = $widget->{parent}) {
3636 $self->{realloc}{$parent+0} = $parent
3637 unless $queue{$parent+0};
3638
3639 $parent->{force_size_alloc} = 1;
3640 $self->{size_alloc}{$parent+0} = $parent;
3641 }
3130 } 3642 }
3643
3644 delete $self->{realloc}{$widget+0};
3131 } 3645 }
3132 } 3646 }
3133 3647
3134 while (my $size_alloc = delete $self->{size_alloc}) { 3648 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3649 my @queue = sort { $b->{visible} <=> $a->{visible} }
3136 values %$size_alloc; 3650 values %$size_alloc;
3137 3651
3138 while () { 3652 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last }; 3653 my $widget = pop @queue || last;
3654
3655 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140 3656
3141 $w = 0 if $w < 0; 3657 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0; 3658 $h = 0 if $h < 0;
3143 3659
3660 $w = int $w + 0.5;
3661 $h = int $h + 0.5;
3662
3663 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3664 $widget->{old_w} = $widget->{w};
3665 $widget->{old_h} = $widget->{h};
3666
3144 $widget->{w} = $w; 3667 $widget->{w} = $w;
3145 $widget->{h} = $h; 3668 $widget->{h} = $h;
3669
3146 $widget->emit (size_allocate => $w, $h); 3670 $widget->emit (size_allocate => $w, $h);
3671 }
3147 } 3672 }
3148 } 3673 }
3149 3674
3150 while ($self->{post_alloc_hook}) { 3675 while ($self->{post_alloc_hook}) {
3151 $_->() 3676 $_->()
3152 for values %{delete $self->{post_alloc_hook}}; 3677 for values %{delete $self->{post_alloc_hook}};
3153 } 3678 }
3679
3154 3680
3155 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3681 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3682 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157 glClear GL_COLOR_BUFFER_BIT; 3683 glClear GL_COLOR_BUFFER_BIT;
3158 3684
3160 glLoadIdentity; 3686 glLoadIdentity;
3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3687 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162 glMatrixMode GL_MODELVIEW; 3688 glMatrixMode GL_MODELVIEW;
3163 glLoadIdentity; 3689 glLoadIdentity;
3164 3690
3691 {
3692 package CFClient::UI::Base;
3693
3694 ($draw_x, $draw_y, $draw_w, $draw_h) =
3695 (0, 0, $self->{w}, $self->{h});
3696 }
3697
3165 $self->_draw; 3698 $self->_draw;
3166} 3699}
3167 3700
3168############################################################################# 3701#############################################################################
3169 3702

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines