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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.322 by root, Wed Jul 5 01:53:24 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 179
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185 186
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 189
189 } 190 }
190 } 191 }
191 192
192 reconfigure_widgets; 193 reconfigure_widgets;
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
392 399
393 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
394 401
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 405 }
399} 406}
400 407
401# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
402sub coord2local { 409sub coord2local {
… …
410 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
411 418
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 420}
414 421
415sub focus_in { 422sub invoke_focus_in {
416 my ($self) = @_; 423 my ($self) = @_;
417 424
418 return if $FOCUS == $self; 425 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
420 427
421 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
422 429
423 $self->_emit (focus_in => $focus); 430 $self->update;
424 431
425 $focus->update if $focus; 432 0
426 $FOCUS->update;
427} 433}
428 434
429sub focus_out { 435sub invoke_focus_out {
430 my ($self) = @_; 436 my ($self) = @_;
431 437
432 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
433 439
434 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
435 441
436 $self->_emit (focus_out => $focus); 442 $self->update;
437 443
438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 445 unless $FOCUS;
442}
443 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
444sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
445sub button_up { } 458sub invoke_button_up { 1 }
446sub key_down { } 459sub invoke_key_down { 1 }
447sub key_up { } 460sub invoke_key_up { 1 }
448 461
449sub button_down { 462sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
451 464
452 $self->focus_in; 465 $self->grab_focus;
453}
454 466
455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
459sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
460 484
461sub find_widget { 485sub find_widget {
462 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
463 487
464 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
473sub set_parent { 497sub set_parent {
474 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
475 499
476 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
477 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
478}
479
480sub connect {
481 my ($self, $signal, $cb) = @_;
482
483 push @{ $self->{signal_cb}{$signal} }, $cb;
484}
485
486sub _emit {
487 my ($self, $signal, @args) = @_;
488
489 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
490}
491
492sub emit {
493 my ($self, $signal, @args) = @_;
494
495 $self->_emit ($signal, @args)
496 || $self->$signal (@args);
497}
498
499sub visibility_change {
500 #my ($self, $visible) = @_;
501} 502}
502 503
503sub realloc { 504sub realloc {
504 my ($self) = @_; 505 my ($self) = @_;
505 506
… …
526 527
527 $self->realloc; 528 $self->realloc;
528 $self->update; 529 $self->update;
529} 530}
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
535
531sub draw { 536sub draw {
532 my ($self) = @_; 537 my ($self) = @_;
533 538
534 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
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
535 548
536 glPushMatrix; 549 glPushMatrix;
537 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
538 $self->_draw;
539 glPopMatrix;
540 551
541 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
542 my ($x, $y) = @$self{qw(x y)};
543
544 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
545 glEnable GL_BLEND; 554 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glBegin GL_QUADS; 556 glBegin GL_QUADS;
548 glVertex $x , $y; 557 glVertex 0 , 0;
549 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
550 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
551 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
552 glEnd; 561 glEnd;
553 glDisable GL_BLEND; 562 glDisable GL_BLEND;
554 } 563 }
555 564
556 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
557 glPushMatrix; 566 glPushMatrix;
558 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
560 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
561 glVertex 0 , 0; 570 glVertex 0 , 0;
562 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
563 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
564 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
565 glEnd; 574 glEnd;
566 glPopMatrix; 575 glPopMatrix;
567 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
568 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
569} 581}
570 582
571sub _draw { 583sub _draw {
572 my ($self) = @_; 584 my ($self) = @_;
573 585
… …
576 588
577sub DESTROY { 589sub DESTROY {
578 my ($self) = @_; 590 my ($self) = @_;
579 591
580 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
581 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
582} 596}
583 597
584############################################################################# 598#############################################################################
585 599
586package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
611 625
612 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
613 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
614 628
615 glEnable GL_BLEND; 629 glEnable GL_BLEND;
616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
617 glColor @$color; 631 glColor_premultiply @$color;
618 632
619 glBegin GL_QUADS; 633 glBegin GL_QUADS;
620 glVertex 0 , 0; 634 glVertex 0 , 0;
621 glVertex 0 , $h; 635 glVertex 0 , $h;
622 glVertex $w, $h; 636 glVertex $w, $h;
… …
653our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
654 668
655sub new { 669sub new {
656 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
657 671
658 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
659 673
660 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
661 children => [], 675 children => [],
662 can_events => 0, 676 can_events => 0,
663 %arg, 677 %arg,
664 ); 678 );
679
665 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
666 682
667 $self 683 $self
668} 684}
669 685
670sub add { 686sub add {
… …
718 $x -= $self->{x}; 734 $x -= $self->{x};
719 $y -= $self->{y}; 735 $y -= $self->{y};
720 736
721 my $res; 737 my $res;
722 738
723 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
724 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
725 and return $res; 741 and return $res;
726 } 742 }
727 743
728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
749} 765}
750 766
751sub add { 767sub add {
752 my ($self, $child) = @_; 768 my ($self, $child) = @_;
753 769
754 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
755
756 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
757} 772}
758 773
759sub remove { 774sub remove {
760 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
769 784
770sub size_request { 785sub size_request {
771 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
772} 787}
773 788
774sub size_allocate { 789sub invoke_size_allocate {
775 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
776 791
777 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
778} 795}
779 796
780############################################################################# 797#############################################################################
798
799# back-buffered drawing area
781 800
782package CFClient::UI::Window; 801package CFClient::UI::Window;
783 802
784our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
785 804
… …
796 815
797 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
798 $self->SUPER::update; 817 $self->SUPER::update;
799} 818}
800 819
801sub size_allocate { 820sub invoke_size_allocate {
802 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
803 822
804 $self->SUPER::size_allocate ($w, $h);
805 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
806} 826}
807 827
808sub _render { 828sub _render {
829 my ($self) = @_;
830
809 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
810} 832}
811 833
812sub render_child { 834sub render_child {
813 my ($self) = @_; 835 my ($self) = @_;
814 836
815 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
816 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
817 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
818 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
819 $self->_render; 848 $self->_render;
820 }; 849 };
821} 850}
822 851
823sub _draw { 852sub _draw {
824 my ($self) = @_; 853 my ($self) = @_;
825 854
826 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
827 856
828 my $tex = $self->{texture} 857 my $tex = $self->{texture}
829 or return; 858 or return;
830 859
831 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
833 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
834 863
835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
836 865
837 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
838} 867}
… …
862 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
863 892
864 ($w, $h) 893 ($w, $h)
865} 894}
866 895
867sub size_allocate { 896sub invoke_size_allocate {
868 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
869 898
870 my $child = $self->child; 899 my $child = $self->child;
871 900
872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
874 903
875 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
876 $self->update; 905 $self->update;
906
907 1
877} 908}
878 909
879sub set_offset { 910sub set_offset {
880 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
881 912
… …
914} 945}
915 946
916sub _render { 947sub _render {
917 my ($self) = @_; 948 my ($self) = @_;
918 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
919 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
920 954
921 $self->SUPER::_render; 955 $self->SUPER::_render;
922} 956}
923 957
… …
926package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
927 961
928our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
929 963
930sub new { 964sub new {
931 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
932 968
933 my $self; 969 my $self;
934 970
935 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
936 vertical => 1, 972 vertical => 1,
… …
941 ; 977 ;
942 978
943 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
944 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
945 slider => $slider, 981 slider => $slider,
946 @_, 982 %arg,
947 ); 983 );
948 984
949 $self->{vp}->add ($self->{scrolled});
950 $self->add ($self->{vp});
951 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
952 987
953 $self 988 $self
954} 989}
955 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
956sub update { 1005sub update {
957 my ($self) = @_; 1006 my ($self) = @_;
958 1007
959 $self->SUPER::update; 1008 $self->SUPER::update;
960 1009
961 # todo: overwrite size_allocate of child 1010 $self->update_slider;
962 my $child = $self->{vp}->child;
963 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
964} 1011}
965 1012
966sub size_allocate { 1013sub invoke_size_allocate {
967 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
968 1015
1016 $self->update_slider;
1017
969 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
970
971 my $child = $self->{vp}->child;
972 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
973} 1019}
974
975#TODO# update range on size_allocate depending on child
976# update viewport offset on scroll
977 1020
978############################################################################# 1021#############################################################################
979 1022
980package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
981 1024
… …
997 1040
998 if ($self->{bg}) { 1041 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
1000 1043
1001 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1003 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1004 1047
1005 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1006 glVertex 0 , 0; 1049 glVertex 0 , 0;
1007 glVertex 0 , $h; 1050 glVertex 0 , $h;
1008 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1030my @border = 1073my @border =
1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1032 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1033 1076
1034sub new { 1077sub new {
1035 my $class = shift; 1078 my ($class, %arg) = @_;
1036 1079
1037 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1038 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1039 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1040 border => 0.6, 1083 border => 0.6,
1041 can_events => 1, 1084 can_events => 1,
1042 min_w => 16, 1085 min_w => 16,
1043 min_h => 16, 1086 min_h => 16,
1044 @_ 1087 %arg,
1045 ); 1088 );
1046 1089
1047 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1048 align => 0, 1091 align => 0,
1049 valign => 1, 1092 valign => 1,
1050 text => $self->{title}, 1093 text => $self->{title},
1051 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1052 1105
1053 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1054} 1115}
1055 1116
1056sub border { 1117sub border {
1057 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1058} 1119}
1059 1120
1060sub size_request { 1121sub size_request {
1061 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1062 1129
1063 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1064 1131
1065 ( 1132 (
1066 $w + $self->border * 2, 1133 $w + $self->border * 2,
1067 $h + $self->border * 2, 1134 $h + $self->border * 2,
1068 ) 1135 )
1069} 1136}
1070 1137
1071sub size_allocate { 1138sub invoke_size_allocate {
1072 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1073 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
1074 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1075 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1076 1151
1077 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1078 if $self->{title};
1079
1080 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1081}
1082 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1083sub button_down { 1168sub invoke_button_down {
1084 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1085 1170
1086 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1087 my $border = $self->border; 1172 my $border = $self->border;
1088 1173
… …
1104 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1105 1190
1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108 1193
1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1109 $self->realloc; 1195 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1111 }; 1196 };
1112 1197
1113 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1114 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1115 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1118 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1119 1204
1120 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1121 1206
1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1123 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1124 } 1215 1
1125} 1216}
1126 1217
1127sub button_up { 1218sub invoke_button_up {
1128 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1129 1220
1130 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1131} 1222}
1132 1223
1133sub mouse_motion { 1224sub invoke_mouse_motion {
1134 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1135 1226
1136 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1137} 1230}
1138 1231
1139sub _draw { 1232sub _draw {
1140 my ($self) = @_; 1233 my ($self) = @_;
1141 1234
1235 my $child = $self->{children}[0];
1236
1142 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1144 1239
1145 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147 1242
1148 my $border = $self->border; 1243 my $border = $self->border;
… …
1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 } 1259 }
1165 1260
1166 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1167 1262
1168 $self->{title}->draw if $self->{title};
1169
1170 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1171} 1274}
1172 1275
1173############################################################################# 1276#############################################################################
1174 1277
1175package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1198 1301
1199 $child->set_parent ($self); 1302 $child->set_parent ($self);
1200 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1201 1304
1202 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1203} 1312}
1204 1313
1205# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1206sub clear { 1315sub clear {
1207 my ($self) = @_; 1316 my ($self) = @_;
… …
1248 (sum @$ws), 1357 (sum @$ws),
1249 (sum @$hs), 1358 (sum @$hs),
1250 ) 1359 )
1251} 1360}
1252 1361
1253sub size_allocate { 1362sub invoke_size_allocate {
1254 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1255 1364
1256 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1257 1366
1258 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1290 } 1399 }
1291 1400
1292 $y += $row_h; 1401 $y += $row_h;
1293 } 1402 }
1294 1403
1404 1
1295} 1405}
1296 1406
1297sub find_widget { 1407sub find_widget {
1298 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1299 1409
… …
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 ) 1448 )
1339} 1449}
1340 1450
1341sub size_allocate { 1451sub invoke_size_allocate {
1342 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1343 1453
1344 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1345 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1346 1456
1347 my @req; 1457 my @req;
1348 1458
1349 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1350 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1351 } else { 1461 } else {
1352 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1353 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1354 1464
1355 if ($req > $space) { 1465 if ($req > $space) {
1356 # ah well, not enough space 1466 # ah well, not enough space
1357 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1358 } else { 1468 } else {
1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1360 1470
1361 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1362 1472
1363 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1364 for 0 .. $#$children; 1474 for 0 .. $#children;
1365 } 1475 }
1366 } 1476 }
1367 1477
1368 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1369 1479
1370 my $pos = 0; 1480 my $pos = 0;
1371 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1372 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1374 1484
1375 $pos += $alloc; 1485 $pos += $alloc;
1376 } 1486 }
1377 1487
1378 1 1488 1
… …
1426 #font => default_font 1536 #font => default_font
1427 #text => initial text 1537 #text => initial text
1428 #markup => initial narkup 1538 #markup => initial narkup
1429 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1430 ellipsise => 3, # end 1540 ellipsise => 3, # end
1431 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1432 fontsize => 1, 1542 fontsize => 1,
1433 align => -1, 1543 align => -1,
1434 valign => -1, 1544 valign => -1,
1435 padding_x => 2, 1545 padding_x => 2,
1436 padding_y => 2, 1546 padding_y => 2,
1437 can_events => 0, 1547 can_events => 0,
1438 %arg 1548 %arg
1439 ); 1549 );
1440 1550
1441 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1442 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1443 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1444 $self->{template} = $layout; 1554 $self->{template} = $layout;
1445 } 1555 }
1446 1556
1447 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
1468 1578
1469 delete $self->{texture}; 1579 delete $self->{texture};
1470 $self->SUPER::update; 1580 $self->SUPER::update;
1471} 1581}
1472 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1473sub set_text { 1590sub set_text {
1474 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1475 1592
1476 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1478 1595
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1481 1597
1598 delete $self->{size_req};
1482 $self->realloc; 1599 $self->realloc;
1483 $self->update; 1600 $self->update;
1484} 1601}
1485 1602
1486sub set_markup { 1603sub set_markup {
… …
1489 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1490 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1491 1608
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1610
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1496 1612
1613 delete $self->{size_req};
1497 $self->realloc; 1614 $self->realloc;
1498 $self->update; 1615 $self->update;
1499} 1616}
1500 1617
1501sub size_request { 1618sub size_request {
1502 my ($self) = @_; 1619 my ($self) = @_;
1503 1620
1621 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1627
1510 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1511 1629
1512 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1633
1516 my ($w2, $h2) = $self->{template}->size; 1634 my ($w2, $h2) = $self->{template}->size;
1517 1635
1518 $w = List::Util::max $w, $w2; 1636 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1637 $h = List::Util::max $h, $h2;
1638 }
1639
1640 [$w, $h]
1520 } 1641 };
1521 1642
1522 ($w, $h) 1643 @{ $self->{size_req} }
1523} 1644}
1524 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1525sub size_allocate { 1650sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1652
1653 delete $self->{ox};
1527 1654
1528 delete $self->{texture} 1655 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1656 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1657
1658 1
1530} 1659}
1531 1660
1532sub set_fontsize { 1661sub set_fontsize {
1533 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1534 1663
1535 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1536 delete $self->{texture}; 1666 delete $self->{texture};
1537 1667
1538 $self->realloc; 1668 $self->realloc;
1539} 1669}
1540 1670
1671sub reconfigure {
1672 my ($self) = @_;
1673
1674 delete $self->{size_req};
1675 delete $self->{texture};
1676
1677 $self->SUPER::reconfigure;
1678}
1679
1541sub _draw { 1680sub _draw {
1542 my ($self) = @_; 1681 my ($self) = @_;
1543 1682
1544 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1545 1684
1546 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1547 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1548 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1549 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553 1692
1554 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1693 $self->{size_req}
1694 };
1555 1695
1696 unless (exists $self->{ox}) {
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1559 1700
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1563
1564 $tex
1565 }; 1704 };
1566 1705
1567 glEnable GL_TEXTURE_2D; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1569 1708
1570 if ($tex->{format} == GL_ALPHA) { 1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1571 glColor @{$self->{fg}};
1572 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1573 } else {
1574 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1575 }
1576
1577 glDisable GL_TEXTURE_2D;
1578} 1710}
1579 1711
1580############################################################################# 1712#############################################################################
1581 1713
1582package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
1596 can_hover => 1, 1728 can_hover => 1,
1597 can_focus => 1, 1729 can_focus => 1,
1598 valign => 0, 1730 valign => 0,
1599 can_events => 1, 1731 can_events => 1,
1600 #text => ... 1732 #text => ...
1733 #hidden => "*",
1601 @_ 1734 @_
1602 ) 1735 )
1603} 1736}
1604 1737
1605sub _set_text { 1738sub _set_text {
… …
1607 1740
1608 delete $self->{cur_h}; 1741 delete $self->{cur_h};
1609 1742
1610 return if $self->{text} eq $text; 1743 return if $self->{text} eq $text;
1611 1744
1612 delete $self->{texture};
1613
1614 $self->{last_activity} = $::NOW; 1745 $self->{last_activity} = $::NOW;
1615 $self->{text} = $text; 1746 $self->{text} = $text;
1616 1747
1617 $text =~ s/./*/g if $self->{hidden}; 1748 $text =~ s/./*/g if $self->{hidden};
1618 $self->{layout}->set_text ("$text "); 1749 $self->{layout}->set_text ("$text ");
1750 delete $self->{size_req};
1619 1751
1620 $self->_emit (changed => $self->{text}); 1752 $self->emit (changed => $self->{text});
1753
1754 $self->realloc;
1755 $self->update;
1621} 1756}
1622 1757
1623sub set_text { 1758sub set_text {
1624 my ($self, $text) = @_; 1759 my ($self, $text) = @_;
1625 1760
1626 $self->{cursor} = length $text; 1761 $self->{cursor} = length $text;
1627 $self->_set_text ($text); 1762 $self->_set_text ($text);
1628
1629 $self->realloc;
1630} 1763}
1631 1764
1632sub get_text { 1765sub get_text {
1633 $_[0]{text} 1766 $_[0]{text}
1634} 1767}
… …
1639 my ($w, $h) = $self->SUPER::size_request; 1772 my ($w, $h) = $self->SUPER::size_request;
1640 1773
1641 ($w + 1, $h) # add 1 for cursor 1774 ($w + 1, $h) # add 1 for cursor
1642} 1775}
1643 1776
1644sub key_down { 1777sub invoke_key_down {
1645 my ($self, $ev) = @_; 1778 my ($self, $ev) = @_;
1646 1779
1647 my $mod = $ev->{mod}; 1780 my $mod = $ev->{mod};
1648 my $sym = $ev->{sym}; 1781 my $sym = $ev->{sym};
1649 my $uni = $ev->{unicode}; 1782 my $uni = $ev->{unicode};
… …
1661 } elsif ($sym == CFClient::SDLK_HOME) { 1794 } elsif ($sym == CFClient::SDLK_HOME) {
1662 $self->{cursor} = 0; 1795 $self->{cursor} = 0;
1663 } elsif ($sym == CFClient::SDLK_END) { 1796 } elsif ($sym == CFClient::SDLK_END) {
1664 $self->{cursor} = length $text; 1797 $self->{cursor} = length $text;
1665 } elsif ($uni == 27) { 1798 } elsif ($uni == 27) {
1666 $self->_emit ('escape'); 1799 $self->emit ('escape');
1667 } elsif ($uni) { 1800 } elsif ($uni) {
1668 substr $text, $self->{cursor}++, 0, chr $uni; 1801 substr $text, $self->{cursor}++, 0, chr $uni;
1802 } else {
1803 return 0;
1669 } 1804 }
1670 1805
1671 $self->_set_text ($text); 1806 $self->_set_text ($text);
1672 1807
1673 $self->realloc; 1808 $self->realloc;
1674}
1675 1809
1810 1
1811}
1812
1676sub focus_in { 1813sub invoke_focus_in {
1677 my ($self) = @_; 1814 my ($self) = @_;
1678 1815
1679 $self->{last_activity} = $::NOW; 1816 $self->{last_activity} = $::NOW;
1680 1817
1681 $self->SUPER::focus_in; 1818 $self->SUPER::invoke_focus_in
1682} 1819}
1683 1820
1684sub button_down { 1821sub invoke_button_down {
1685 my ($self, $ev, $x, $y) = @_; 1822 my ($self, $ev, $x, $y) = @_;
1686 1823
1687 $self->SUPER::button_down ($ev, $x, $y); 1824 $self->SUPER::invoke_button_down ($ev, $x, $y);
1688 1825
1689 my $idx = $self->{layout}->xy_to_index ($x, $y); 1826 my $idx = $self->{layout}->xy_to_index ($x, $y);
1690 1827
1691 # byte-index to char-index 1828 # byte-index to char-index
1692 my $text = $self->{text}; 1829 my $text = $self->{text};
1693 utf8::encode $text; 1830 utf8::encode $text;
1694 $self->{cursor} = length substr $text, 0, $idx; 1831 $self->{cursor} = length substr $text, 0, $idx;
1695 1832
1696 $self->_set_text ($self->{text}); 1833 $self->_set_text ($self->{text});
1697 $self->update; 1834 $self->update;
1835
1836 1
1698} 1837}
1699 1838
1700sub mouse_motion { 1839sub invoke_mouse_motion {
1701 my ($self, $ev, $x, $y) = @_; 1840 my ($self, $ev, $x, $y) = @_;
1702# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1841# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1842
1843 1
1703} 1844}
1704 1845
1705sub _draw { 1846sub _draw {
1706 my ($self) = @_; 1847 my ($self) = @_;
1707 1848
1708 local $self->{fg} = $self->{fg}; 1849 local $self->{fg} = $self->{fg};
1709 1850
1710 if ($FOCUS == $self) { 1851 if ($FOCUS == $self) {
1711 glColor @{$self->{active_bg}}; 1852 glColor_premultiply @{$self->{active_bg}};
1712 $self->{fg} = $self->{active_fg}; 1853 $self->{fg} = $self->{active_fg};
1713 } else { 1854 } else {
1714 glColor @{$self->{bg}}; 1855 glColor_premultiply @{$self->{bg}};
1715 } 1856 }
1716 1857
1717 glEnable GL_BLEND; 1858 glEnable GL_BLEND;
1718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1719 glBegin GL_QUADS; 1860 glBegin GL_QUADS;
1720 glVertex 0 , 0; 1861 glVertex 0 , 0;
1721 glVertex 0 , $self->{h}; 1862 glVertex 0 , $self->{h};
1722 glVertex $self->{w}, $self->{h}; 1863 glVertex $self->{w}, $self->{h};
1723 glVertex $self->{w}, 0; 1864 glVertex $self->{w}, 0;
… …
1748 1889
1749our @ISA = CFClient::UI::EntryBase::; 1890our @ISA = CFClient::UI::EntryBase::;
1750 1891
1751use CFClient::OpenGL; 1892use CFClient::OpenGL;
1752 1893
1753sub key_down { 1894sub invoke_key_down {
1754 my ($self, $ev) = @_; 1895 my ($self, $ev) = @_;
1755 1896
1756 my $sym = $ev->{sym}; 1897 my $sym = $ev->{sym};
1757 1898
1758 if ($sym == 13) { 1899 if ($sym == 13) {
1759 unshift @{$self->{history}}, 1900 unshift @{$self->{history}},
1760 my $txt = $self->get_text; 1901 my $txt = $self->get_text;
1902
1761 $self->{history_pointer} = -1; 1903 $self->{history_pointer} = -1;
1762 $self->{history_saveback} = ''; 1904 $self->{history_saveback} = '';
1763 $self->_emit (activate => $txt); 1905 $self->emit (activate => $txt);
1764 $self->update; 1906 $self->update;
1765 1907
1766 } elsif ($sym == CFClient::SDLK_UP) { 1908 } elsif ($sym == CFClient::SDLK_UP) {
1767 if ($self->{history_pointer} < 0) { 1909 if ($self->{history_pointer} < 0) {
1768 $self->{history_saveback} = $self->get_text; 1910 $self->{history_saveback} = $self->get_text;
… …
1784 } else { 1926 } else {
1785 $self->set_text ($self->{history_saveback}); 1927 $self->set_text ($self->{history_saveback});
1786 } 1928 }
1787 1929
1788 } else { 1930 } else {
1789 $self->SUPER::key_down ($ev); 1931 return $self->SUPER::invoke_key_down ($ev)
1932 }
1933
1790 } 1934 1
1791
1792} 1935}
1793 1936
1794############################################################################# 1937#############################################################################
1795 1938
1796package CFClient::UI::Button; 1939package CFClient::UI::Button;
… …
1817 can_events => 1, 1960 can_events => 1,
1818 @_ 1961 @_
1819 ) 1962 )
1820} 1963}
1821 1964
1822sub activate { }
1823
1824sub button_up { 1965sub invoke_button_up {
1825 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1826 1967
1827 $self->emit ("activate") 1968 $self->emit ("activate")
1828 if $x >= 0 && $x < $self->{w} 1969 if $x >= 0 && $x < $self->{w}
1829 && $y >= 0 && $y < $self->{h}; 1970 && $y >= 0 && $y < $self->{h};
1971
1972 1
1830} 1973}
1831 1974
1832sub _draw { 1975sub _draw {
1833 my ($self) = @_; 1976 my ($self) = @_;
1834 1977
1835 local $self->{fg} = $self->{fg}; 1978 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1836
1837 if ($GRAB == $self) {
1838 $self->{fg} = $self->{active_fg};
1839 }
1840 1979
1841 glEnable GL_TEXTURE_2D; 1980 glEnable GL_TEXTURE_2D;
1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1981 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1843 glColor 0, 0, 0, 1; 1982 glColor 0, 0, 0, 1;
1844 1983
1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1984 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1846 1985
1847 glDisable GL_TEXTURE_2D; 1986 glDisable GL_TEXTURE_2D;
1848 1987
1849 $self->SUPER::_draw; 1988 $self->SUPER::_draw;
1989}
1990
1991#############################################################################
1992
1993package CFClient::UI::ImageButton;
1994
1995our @ISA = CFClient::UI::Image::;
1996
1997use CFClient::OpenGL;
1998
1999my %textures;
2000
2001sub new {
2002 my $class = shift;
2003
2004 my $self = $class->SUPER::new (
2005 padding_x => 4,
2006 padding_y => 4,
2007 fg => [1, 1, 1],
2008 active_fg => [0, 0, 1],
2009 can_hover => 1,
2010 align => 0,
2011 valign => 0,
2012 can_events => 1,
2013 @_
2014 );
2015}
2016
2017sub invoke_button_up {
2018 my ($self, $ev, $x, $y) = @_;
2019
2020 $self->emit ("activate")
2021 if $x >= 0 && $x < $self->{w}
2022 && $y >= 0 && $y < $self->{h};
2023
2024 1
1850} 2025}
1851 2026
1852############################################################################# 2027#############################################################################
1853 2028
1854package CFClient::UI::CheckBox; 2029package CFClient::UI::CheckBox;
… …
1881 my ($self) = @_; 2056 my ($self) = @_;
1882 2057
1883 (6) x 2 2058 (6) x 2
1884} 2059}
1885 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
1886sub button_down { 2069sub invoke_button_down {
1887 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
1888 2071
1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891 $self->{state} = !$self->{state}; 2074 $self->toggle;
1892 $self->_emit (changed => $self->{state}); 2075 } else {
2076 return 0
2077 }
2078
1893 } 2079 1
1894} 2080}
1895 2081
1896sub _draw { 2082sub _draw {
1897 my ($self) = @_; 2083 my ($self) = @_;
1898 2084
… …
1918package CFClient::UI::Image; 2104package CFClient::UI::Image;
1919 2105
1920our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
1921 2107
1922use CFClient::OpenGL; 2108use CFClient::OpenGL;
1923use Carp qw/confess/;
1924 2109
1925our %loaded_images; 2110our %texture_cache;
1926 2111
1927sub new { 2112sub new {
1928 my $class = shift; 2113 my $class = shift;
1929 2114
1930 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
1931 2119
1932 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
1933 2122
1934 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
1935 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1936 2125
1937 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
1938 2127
1939 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1940
1941 $self->{aspect} = $tex->{w} / $tex->{h};
1942 2129
1943 $self 2130 $self
1944} 2131}
1945 2132
1946sub size_request { 2133sub size_request {
1947 my ($self) = @_; 2134 my ($self) = @_;
1948 2135
1949 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
1950} 2137}
1951 2138
1952sub _draw { 2139sub _draw {
1953 my ($self) = @_; 2140 my ($self) = @_;
1954 2141
… …
2063 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2064 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2065 2252
2066 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2067 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2068 2258
2069 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2070 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2071 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
2072 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2073 2264
2074 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2265 glBindTexture GL_TEXTURE_2D, $t1->{name};
2075 glBegin GL_QUADS; 2266 glBegin GL_QUADS;
… …
2090 2281
2091 if ($t3) { 2282 if ($t3) {
2092 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2093 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2094 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2095 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2096 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2097 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2098 glEnd; 2289 glEnd;
2099 } 2290 }
2100 2291
2101 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2189 $self->update; 2380 $self->update;
2190 2381
2191 $self 2382 $self
2192} 2383}
2193 2384
2194sub changed { }
2195
2196sub set_range { 2385sub set_range {
2197 my ($self, $range) = @_; 2386 my ($self, $range) = @_;
2198 2387
2199 ($range, $self->{range}) = ($self->{range}, $range); 2388 ($range, $self->{range}) = ($self->{range}, $range);
2200 2389
2201 $self->update
2202 if "@$range" ne "@{$self->{range}}"; 2390 if ("@$range" ne "@{$self->{range}}") {
2391 $self->update;
2392 $self->set_value ($self->{range}[0]);
2393 }
2203} 2394}
2204 2395
2205sub set_value { 2396sub set_value {
2206 my ($self, $value) = @_; 2397 my ($self, $value) = @_;
2207 2398
… …
2218 if $unit; 2409 if $unit;
2219 2410
2220 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2411 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2221 2412
2222 if ($value != $old_value) { 2413 if ($value != $old_value) {
2223 $self->_emit (changed => $value); 2414 $self->emit (changed => $value);
2224 $self->update; 2415 $self->update;
2225 } 2416 }
2226} 2417}
2227 2418
2228sub size_request { 2419sub size_request {
2229 my ($self) = @_; 2420 my ($self) = @_;
2230 2421
2231 ($self->{req_w}, $self->{req_h}) 2422 ($self->{req_w}, $self->{req_h})
2232} 2423}
2233 2424
2234sub button_down { 2425sub invoke_button_down {
2235 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
2236 2427
2237 $self->SUPER::button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2238 2429
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2431
2241 $self->mouse_motion ($ev, $x, $y); 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2242} 2433}
2243 2434
2244sub mouse_motion { 2435sub invoke_mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2246 2437
2247 if ($GRAB == $self) { 2438 if ($GRAB == $self) {
2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2439 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2249 2440
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2441 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2442
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2443 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2444
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2445 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2446 } else {
2447 return 0;
2448 }
2449
2255 } 2450 1
2256} 2451}
2257 2452
2258sub update { 2453sub update {
2259 my ($self) = @_; 2454 my ($self) = @_;
2260 2455
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2456 delete $self->{knob_w};
2457 $self->SUPER::update;
2458}
2459
2460sub _draw {
2461 my ($self) = @_;
2462
2463 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2464 $self->set_value ($self->{range}[0]);
2263 2465
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2466 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2467 my $range = ($hi - $page - $lo) || 1e-100;
2266 2468
… …
2272 $value = ($value - $lo) / $range; 2474 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2475 $value = $value * $self->{scale} + $self->{offset};
2274 2476
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2477 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2478 $self->{knob_w} = $knob_w;
2277 }); 2479 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2480
2285 $self->SUPER::_draw (); 2481 $self->SUPER::_draw ();
2286 2482
2287 glScale $self->{w}, $self->{h}; 2483 glScale $self->{w}, $self->{h};
2288 2484
… …
2349sub set_range { shift->{slider}->set_range (@_) } 2545sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) } 2546sub set_value { shift->{slider}->set_value (@_) }
2351 2547
2352############################################################################# 2548#############################################################################
2353 2549
2354package CFClient::UI::TextView; 2550package CFClient::UI::TextScroller;
2355 2551
2356our @ISA = CFClient::UI::HBox::; 2552our @ISA = CFClient::UI::HBox::;
2357 2553
2358use CFClient::OpenGL; 2554use CFClient::OpenGL;
2359 2555
… …
2361 my $class = shift; 2557 my $class = shift;
2362 2558
2363 my $self = $class->SUPER::new ( 2559 my $self = $class->SUPER::new (
2364 fontsize => 1, 2560 fontsize => 1,
2365 can_events => 0, 2561 can_events => 0,
2562 indent => 0,
2366 #font => default_font 2563 #font => default_font
2367 @_, 2564 @_,
2368 2565
2369 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2370 par => [], 2567 par => [],
2371 height => 0, 2568 height => 0,
2372 children => [ 2569 children => [
2373 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2374 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2385 2582
2386 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2387 $self->reflow; 2584 $self->reflow;
2388} 2585}
2389 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2390sub size_allocate { 2596sub invoke_size_allocate {
2391 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2392 2598
2393 $self->SUPER::size_allocate ($w, $h); 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2394 2601
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 2606
2399 $self->reflow; 2607 $self->reflow;
2400}
2401 2608
2402sub text_size { 2609 local $self->{children} = [$empty, $slider];
2403 my ($self, $text, $indent) = @_; 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2611}
2612
2613sub get_layout {
2614 my ($self, $para) = @_;
2404 2615
2405 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2406 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2409 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2410 2629 );
2630
2411 $layout->size 2631 $layout
2412} 2632}
2413 2633
2414sub reflow { 2634sub reflow {
2415 my ($self) = @_; 2635 my ($self) = @_;
2416 2636
… …
2425 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2426} 2646}
2427 2647
2428sub clear { 2648sub clear {
2429 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2430 2653
2431 $self->{par} = []; 2654 $self->{par} = [];
2432 $self->{height} = 0; 2655 $self->{height} = 0;
2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2434} 2657}
2435 2658
2436sub add_paragraph { 2659sub add_paragraph {
2437 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2438 2661
2439 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2440 my ($w, $h) = $self->text_size ($line); 2663
2441 $self->{height} += $h; 2664 $para = {
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2443 } 2671 };
2444 2672
2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2446} 2685}
2447 2686
2448sub update { 2687sub update {
2449 my ($self) = @_; 2688 my ($self) = @_;
2450 2689
… …
2452 2691
2453 return unless $self->{h} > 0; 2692 return unless $self->{h} > 0;
2454 2693
2455 delete $self->{texture}; 2694 delete $self->{texture};
2456 2695
2457 $ROOT->on_post_alloc ($self, sub { 2696 $ROOT->on_post_alloc ($self => sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459 2698
2460 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2461 my $height = 0; 2700 my $height = 0;
2462 2701
2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2467 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2469 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2470 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3]; 2706
2473 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2474 } 2710 }
2475 2711
2476 $height += $_->[1]; 2712 $height += $para->{h};
2477 } 2713 }
2478 2714
2479 $self->{height} = $height; 2715 $self->{height} = $height;
2480 2716
2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2482 2718
2483 delete $self->{texture}; 2719 delete $self->{texture};
2484 } 2720 }
2485 2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2724 }
2725
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2727 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
2489 2729
2490 my $top = int $self->{children}[1]{range}[0]; 2730 my $top = int $self->{children}[1]{range}[0];
2491 2731
2492 my $y0 = $top; 2732 my $y0 = $top;
2493 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2494 2734
2495 my $y = 0; 2735 my $y = 0;
2496 2736
2497 my $layout = $self->{layout};
2498
2499 $layout->set_font ($self->{font}) if $self->{font};
2500
2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2504
2505 for my $par (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2506 my $h = $par->[1]; 2738 my $h = $para->{h};
2507 2739
2508 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2511 $layout->set_markup ($par->[4]);
2512 2741
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2514 2743
2515 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2517 } 2758 }
2518 2759
2519 $y += $h; 2760 $y += $h;
2520 } 2761 }
2521
2522 glDisable GL_BLEND;
2523 }; 2762 };
2524 }); 2763 });
2525} 2764}
2526 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2527sub _draw { 2775sub _draw {
2528 my ($self) = @_; 2776 my ($self) = @_;
2529 2777
2530 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2535 2783
2536 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2537
2538} 2785}
2539 2786
2540############################################################################# 2787#############################################################################
2541 2788
2542package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2629 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2633 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2634 2884
2635 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2636 markup => $tooltip, 2886 markup => $tooltip,
2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2638 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2649 2899
2650 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2651} 2901}
2652 2902
2653sub size_allocate { 2903sub invoke_size_allocate {
2654 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2655 2905
2656 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2657} 2907}
2658 2908
2659sub visibility_change { 2909sub invoke_visibility_change {
2660 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2661 2911
2662 return unless $visible; 2912 return unless $visible;
2663 2913
2664 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2666 or return; 2916 or return;
2667 2917
2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2669 2919
2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2671 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2672 2922
2673 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2674 }); 2924 });
2675} 2925}
2676 2926
… …
2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2766 3016
2767 if ($tex) { 3017 if ($tex) {
2768 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2770 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2772 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2773 } 3023 }
2774} 3024}
2775 3025
2776sub DESTROY { 3026sub destroy {
2777 my ($self) = @_; 3027 my ($self) = @_;
2778 3028
2779 $self->{timer}->cancel 3029 $self->{timer}->cancel
2780 if $self->{timer}; 3030 if $self->{timer};
2781 3031
2782 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2783} 3033}
3034
3035#############################################################################
3036
3037package CFClient::UI::Buttonbar;
3038
3039our @ISA = CFClient::UI::HBox::;
3040
3041# TODO: should actualyl wrap buttons and other goodies.
2784 3042
2785############################################################################# 3043#############################################################################
2786 3044
2787package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2788 3046
… …
2800 ); 3058 );
2801 3059
2802 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2803 3061
2804 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2805 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2806 3064
2807 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2808 if (!ref $widget) { 3066 if (!ref $widget) {
3067 if ($widget =~ /\t/) {
3068 my ($left, $right) = split /\t/, $widget, 2;
3069
3070 $widget = new CFClient::UI::HBox
3071 can_hover => 1,
3072 can_events => 1,
3073 tooltip => $tooltip,
3074 children => [
3075 (new CFClient::UI::Label markup => $left, expand => 1),
3076 (new CFClient::UI::Label markup => $right, align => +1),
3077 ],
3078 ;
3079
3080 } else {
2809 $widget = new CFClient::UI::Label 3081 $widget = new CFClient::UI::Label
2810 can_hover => 1, 3082 can_hover => 1,
2811 can_events => 1, 3083 can_events => 1,
2812 text => $widget; 3084 markup => $widget,
3085 tooltip => $tooltip;
3086 }
2813 } 3087 }
2814 3088
2815 $self->{item}{$widget} = $item; 3089 $self->{item}{$widget} = $item;
2816 3090
2817 $self->{vbox}->add ($widget); 3091 $self->{vbox}->add ($widget);
… …
2822 3096
2823# popup given the event (must be a mouse button down event currently) 3097# popup given the event (must be a mouse button down event currently)
2824sub popup { 3098sub popup {
2825 my ($self, $ev) = @_; 3099 my ($self, $ev) = @_;
2826 3100
2827 $self->_emit ("popdown"); 3101 $self->emit ("popdown");
2828 3102
2829 # maybe save $GRAB? must be careful about events... 3103 # maybe save $GRAB? must be careful about events...
2830 $GRAB = $self; 3104 $GRAB = $self;
2831 $self->{button} = $ev->{button}; 3105 $self->{button} = $ev->{button};
2832 3106
2833 $self->show; 3107 $self->show;
2834 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3108 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2835} 3109}
2836 3110
2837sub mouse_motion { 3111sub invoke_mouse_motion {
2838 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2839 3113
2840 # TODO: should use vbox->find_widget or so 3114 # TODO: should use vbox->find_widget or so
2841 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3115 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842 $self->{hover} = $self->{item}{$HOVER}; 3116 $self->{hover} = $self->{item}{$HOVER};
2843}
2844 3117
3118 0
3119}
3120
2845sub button_up { 3121sub invoke_button_up {
2846 my ($self, $ev, $x, $y) = @_; 3122 my ($self, $ev, $x, $y) = @_;
2847 3123
2848 if ($ev->{button} == $self->{button}) { 3124 if ($ev->{button} == $self->{button}) {
2849 undef $GRAB; 3125 undef $GRAB;
2850 $self->hide; 3126 $self->hide;
2851 3127
2852 $self->_emit ("popdown"); 3128 $self->emit ("popdown");
2853 $self->{hover}[1]->() if $self->{hover}; 3129 $self->{hover}[1]->() if $self->{hover};
3130 } else {
3131 return 0
3132 }
3133
2854 } 3134 1
2855} 3135}
2856 3136
2857############################################################################# 3137#############################################################################
2858 3138
2859package CFClient::UI::Statusbox; 3139package CFClient::UI::Multiplexer;
2860 3140
2861our @ISA = CFClient::UI::VBox::; 3141our @ISA = CFClient::UI::Container::;
2862 3142
2863sub new { 3143sub new {
2864 my $class = shift; 3144 my $class = shift;
2865 3145
2866 $class->SUPER::new ( 3146 my $self = $class->SUPER::new (
3147 @_,
3148 );
3149
3150 $self->{current} = $self->{children}[0]
3151 if @{ $self->{children} };
3152
3153 $self
3154}
3155
3156sub add {
3157 my ($self, @widgets) = @_;
3158
3159 $self->SUPER::add (@widgets);
3160
3161 $self->{current} = $self->{children}[0]
3162 if @{ $self->{children} };
3163}
3164
3165sub get_current_page {
3166 my ($self) = @_;
3167
3168 $self->{current}
3169}
3170
3171sub set_current_page {
3172 my ($self, $page_or_widget) = @_;
3173
3174 my $widget = ref $page_or_widget
3175 ? $page_or_widget
3176 : $self->{children}[$page_or_widget];
3177
3178 $self->{current} = $widget;
3179 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3180
3181 $self->emit (page_changed => $self->{current});
3182
3183 $self->realloc;
3184}
3185
3186sub visible_children {
3187 $_[0]{current}
3188}
3189
3190sub size_request {
3191 my ($self) = @_;
3192
3193 $self->{current}->size_request
3194}
3195
3196sub invoke_size_allocate {
3197 my ($self, $w, $h) = @_;
3198
3199 $self->{current}->configure (0, 0, $w, $h);
3200
3201 1
3202}
3203
3204sub _draw {
3205 my ($self) = @_;
3206
3207 $self->{current}->draw;
3208}
3209
3210#############################################################################
3211
3212package CFClient::UI::Notebook;
3213
3214our @ISA = CFClient::UI::VBox::;
3215
3216sub new {
3217 my $class = shift;
3218
3219 my $self = $class->SUPER::new (
3220 buttonbar => (new CFClient::UI::Buttonbar),
3221 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3222 # filter => # will be put between multiplexer and $self
3223 @_,
3224 );
3225
3226 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3227 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3228
3229 $self
3230}
3231
3232sub add {
3233 my ($self, $title, $widget, $tooltip) = @_;
3234
3235 Scalar::Util::weaken $self;
3236
3237 $self->{buttonbar}->add (new CFClient::UI::Button
3238 markup => $title,
3239 tooltip => $tooltip,
3240 on_activate => sub { $self->set_current_page ($widget) },
3241 );
3242
3243 $self->{multiplexer}->add ($widget);
3244}
3245
3246sub get_current_page {
3247 my ($self) = @_;
3248
3249 $self->{multiplexer}->get_current_page
3250}
3251
3252sub set_current_page {
3253 my ($self, $page) = @_;
3254
3255 $self->{multiplexer}->set_current_page ($page);
3256 $self->emit (page_changed => $self->{multiplexer}{current});
3257}
3258
3259#############################################################################
3260
3261package CFClient::UI::Combobox;
3262
3263use utf8;
3264
3265our @ISA = CFClient::UI::Button::;
3266
3267sub new {
3268 my $class = shift;
3269
3270 my $self = $class->SUPER::new (
3271 options => [], # [value, title, longdesc], ...
3272 value => undef,
3273 @_,
3274 );
3275
3276 $self->_set_value ($self->{value});
3277
3278 $self
3279}
3280
3281sub invoke_button_down {
3282 my ($self, $ev) = @_;
3283
3284 my @menu_items;
3285
3286 for (@{ $self->{options} }) {
3287 my ($value, $title, $tooltip) = @$_;
3288
3289 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290 }
3291
3292 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293}
3294
3295sub _set_value {
3296 my ($self, $value) = @_;
3297
3298 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3299 or return;
3300
3301 $self->{value} = $item->[0];
3302 $self->set_markup ("$item->[1] ⇓");
3303 $self->set_tooltip ($item->[2]);
3304}
3305
3306sub set_value {
3307 my ($self, $value) = @_;
3308
3309 return unless $self->{value} ne $value;
3310
3311 $self->_set_value ($value);
3312 $self->emit (changed => $value);
3313}
3314
3315#############################################################################
3316
3317package CFClient::UI::Statusbox;
3318
3319our @ISA = CFClient::UI::VBox::;
3320
3321sub new {
3322 my $class = shift;
3323
3324 my $self = $class->SUPER::new (
2867 fontsize => 0.8, 3325 fontsize => 0.8,
2868 @_, 3326 @_,
2869 ) 3327 );
3328
3329 Scalar::Util::weaken (my $this = $self);
3330
3331 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3332
3333 $self
2870} 3334}
2871 3335
2872sub reorder { 3336sub reorder {
2873 my ($self) = @_; 3337 my ($self) = @_;
2874 my $NOW = time; 3338 my $NOW = Time::HiRes::time;
3339
3340 # freeze display when hovering over any label
3341 return if $CFClient::UI::TOOLTIP->{owner}
3342 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3343 values %{ $self->{item} };
2875 3344
2876 while (my ($k, $v) = each %{ $self->{item} }) { 3345 while (my ($k, $v) = each %{ $self->{item} }) {
2877 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3346 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878 } 3347 }
2879 3348
… …
2882 my @items = sort { 3351 my @items = sort {
2883 $a->{pri} <=> $b->{pri} 3352 $a->{pri} <=> $b->{pri}
2884 or $b->{id} <=> $a->{id} 3353 or $b->{id} <=> $a->{id}
2885 } values %{ $self->{item} }; 3354 } values %{ $self->{item} };
2886 3355
3356 $self->{timer}->interval (1);
3357
2887 my $count = 10 + 1; 3358 my $count = 10 + 1;
2888 for my $item (@items) { 3359 for my $item (@items) {
2889 last unless --$count; 3360 last unless --$count;
2890 3361
2891 push @widgets, $item->{label} ||= do { 3362 my $label = $item->{label} ||= do {
2892 # TODO: doesn't handle markup well (read as: at all) 3363 # TODO: doesn't handle markup well (read as: at all)
2893 my $short = $item->{count} > 1 3364 my $short = $item->{count} > 1
2894 ? "<b>$item->{count} ×</b> $item->{text}" 3365 ? "<b>$item->{count} ×</b> $item->{text}"
2895 : $item->{text}; 3366 : $item->{text};
2896 3367
… …
2904 tooltip => $item->{tooltip}, 3375 tooltip => $item->{tooltip},
2905 tooltip_font => $::FONT_PROP, 3376 tooltip_font => $::FONT_PROP,
2906 tooltip_width => 0.67, 3377 tooltip_width => 0.67,
2907 fontsize => $item->{fontsize} || $self->{fontsize}, 3378 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44, 3379 max_w => $::WIDTH * 0.44,
2909 fg => $item->{fg}, 3380 fg => [@{ $item->{fg} }],
2910 can_events => 1, 3381 can_events => 1,
2911 can_hover => 1 3382 can_hover => 1
2912 }; 3383 };
3384
3385 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3386 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3387 $label->update;
3388 $label->set_max_size (undef, $label->{req_h} * $diff)
3389 if $diff < 1;
3390 $self->{timer}->interval (1/30);
3391 } else {
3392 $label->{fg}[3] = $item->{fg}[3] || 1;
3393 }
3394
3395 push @widgets, $label;
2913 } 3396 }
2914 3397
2915 $self->clear; 3398 $self->clear;
2916 $self->SUPER::add (reverse @widgets); 3399 $self->SUPER::add (reverse @widgets);
2917} 3400}
… …
2922 $text =~ s/^\s+//; 3405 $text =~ s/^\s+//;
2923 $text =~ s/\s+$//; 3406 $text =~ s/\s+$//;
2924 3407
2925 return unless $text; 3408 return unless $text;
2926 3409
2927 my $timeout = time + ((delete $arg{timeout}) || 60); 3410 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2928 3411
2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3412 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2930 3413
2931 if (my $item = $self->{item}{$group}) { 3414 if (my $item = $self->{item}{$group}) {
2932 if ($item->{text} eq $text) { 3415 if ($item->{text} eq $text) {
2933 $item->{count}++; 3416 $item->{count}++;
2934 } else { 3417 } else {
2935 $item->{count} = 1; 3418 $item->{count} = 1;
2936 $item->{text} = $item->{tooltip} = $text; 3419 $item->{text} = $item->{tooltip} = $text;
2937 } 3420 }
2938 $item->{id} = ++$self->{id}; 3421 $item->{id} += 0.2;#d#
2939 $item->{timeout} = $timeout; 3422 $item->{timeout} = $timeout;
2940 delete $item->{label}; 3423 delete $item->{label};
2941 } else { 3424 } else {
2942 $self->{item}{$group} = { 3425 $self->{item}{$group} = {
2943 id => ++$self->{id}, 3426 id => ++$self->{id},
… …
2949 count => 1, 3432 count => 1,
2950 %arg, 3433 %arg,
2951 }; 3434 };
2952 } 3435 }
2953 3436
3437 $ROOT->on_refresh (reorder => sub {
2954 $self->reorder; 3438 $self->reorder;
3439 });
2955} 3440}
2956 3441
2957sub reconfigure { 3442sub reconfigure {
2958 my ($self) = @_; 3443 my ($self) = @_;
2959 3444
… …
2962 3447
2963 $self->reorder; 3448 $self->reorder;
2964 $self->SUPER::reconfigure; 3449 $self->SUPER::reconfigure;
2965} 3450}
2966 3451
3452sub destroy {
3453 my ($self) = @_;
3454
3455 $self->{timer}->cancel;
3456
3457 $self->SUPER::destroy;
3458}
3459
2967############################################################################# 3460#############################################################################
2968 3461
2969package CFClient::UI::Inventory; 3462package CFClient::UI::Inventory;
2970 3463
2971our @ISA = CFClient::UI::ScrolledWindow::; 3464our @ISA = CFClient::UI::Table::;
2972 3465
2973sub new { 3466sub new {
2974 my $class = shift; 3467 my $class = shift;
2975 3468
2976 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3470 col_expand => [0, 1, 0],
2978 @_, 3471 @_,
2979 ); 3472 );
2980 3473
2981 $self 3474 $self
2982} 3475}
2983 3476
2984sub set_items { 3477sub set_items {
2985 my ($self, $items) = @_; 3478 my ($self, $items) = @_;
2986 3479
2987 $self->{scrolled}->clear; 3480 $self->clear;
2988 return unless $items; 3481 return unless $items;
2989 3482
2990 my @items = sort { 3483 my @items = sort {
2991 ($a->{type} <=> $b->{type}) 3484 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name}) 3485 or ($a->{name} cmp $b->{name})
2993 } @$items; 3486 } values %$items;
2994 3487
2995 $self->{real_items} = \@items; 3488 $self->{real_items} = \@items;
2996 3489
2997 my $row = 0; 3490 my $row = 0;
2998 for my $item (@items) { 3491 for my $item (@items) {
2999 CFClient::Item::update_widgets $item; 3492 CFClient::Item::update_widgets $item;
3000 3493
3001 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3494 $self->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3495 $self->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3496 $self->add (2, $row, $item->{weight_widget});
3004 3497
3005 $row++; 3498 $row++;
3006 } 3499 }
3007} 3500}
3008 3501
3009############################################################################# 3502#############################################################################
3010 3503
3011package CFClient::UI::BindEditor; 3504package CFClient::UI::SpellList;
3012 3505
3013our @ISA = CFClient::UI::FancyFrame::; 3506our @ISA = CFClient::UI::Table::;
3014 3507
3015sub new { 3508sub new {
3016 my $class = shift; 3509 my $class = shift;
3017 3510
3018 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3511 my $self = $class->SUPER::new (
3512 binding => [],
3513 commands => [],
3514 @_,
3515 )
3516}
3019 3517
3020 $self->add (my $vb = new CFClient::UI::VBox); 3518my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3021 3519
3520my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3521 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3522my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3523 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3524my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3525 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3526my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3527 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3528my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3529 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3022 3530
3023 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3531sub rebuild_spell_list {
3024 text => "start recording", 3532 my ($self) = @_;
3025 tooltip => "Start/Stops recording of actions." 3533
3026 ."All subsequent actions after the recording started will be captured." 3534 $CFClient::UI::ROOT->on_refresh ($self => sub {
3027 ."The actions are displayed after the record was stopped." 3535 $self->clear;
3028 ."To bind the action you have to click on the 'Bind' button", 3536
3029 on_activate => sub { 3537 return unless $::CONN;
3030 unless ($self->{recording}) { 3538
3031 $self->start; 3539 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544
3545 my $row = 0;
3546
3547 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548 my $spell = $self->{spell}{$_};
3549
3550 $row++;
3551
3552 my $spell_cb = sub {
3553 my ($widget, $ev) = @_;
3554
3555 if ($ev->{button} == 1) {
3556 $::CONN->user_send ("cast $spell->{name}");
3557 } elsif ($ev->{button} == 2) {
3558 $::CONN->user_send ("invoke $spell->{name}");
3559 } elsif ($ev->{button} == 3) {
3560 (new CFClient::UI::Menu
3561 items => [
3562 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564 ],
3565 )->popup ($ev);
3032 } else { 3566 } else {
3033 $self->stop; 3567 return 0;
3568 }
3569
3570 1
3034 } 3571 };
3572
3573 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574
3575 #TODO: add path info to tooltip
3576 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3577
3578 $self->add (0, $row, new CFClient::UI::Face
3579 face => $spell->{face},
3580 can_hover => 1,
3581 can_events => 1,
3582 tooltip => $tooltip,
3583 on_button_down => $spell_cb,
3584 );
3585
3586 $self->add (1, $row, new CFClient::UI::Label
3587 expand => 1,
3588 text => $spell->{name},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3035 }); 3599 }
3036
3037 $vb->add (new CFClient::UI::Label text => "Actions:");
3038 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3039
3040 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3041 $vb->add (my $hb = new CFClient::UI::HBox);
3042 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3043 $hb->add (new CFClient::UI::Button
3044 text => "bind",
3045 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3046 on_activate => sub {
3047 $self->ask_for_bind;
3048 });
3049
3050 $vb->add (my $hb = new CFClient::UI::HBox);
3051 $hb->add (new CFClient::UI::Button
3052 text => "ok",
3053 expand => 1,
3054 tooltip => "This closes the binding editor and saves the binding",
3055 on_activate => sub {
3056 $self->hide;
3057 $self->commit;
3058 });
3059
3060 $hb->add (new CFClient::UI::Button
3061 text => "cancel",
3062 expand => 1,
3063 tooltip => "This closes the binding editor without saving",
3064 on_activate => sub {
3065 $self->hide;
3066 $self->{binding_cancel}->()
3067 if $self->{binding_cancel};
3068 });
3069
3070 $self->update_binding_widgets;
3071
3072 $self
3073}
3074
3075sub commit {
3076 my ($self) = @_;
3077 my ($mod, $sym, $cmds) = $self->get_binding;
3078 if ($sym != 0 && @$cmds > 0) {
3079 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3080 ."'. Don't forget 'Save Config'!");
3081 $self->{binding_change}->($mod, $sym, $cmds)
3082 if $self->{binding_change};
3083 } else {
3084 $::STATUSBOX->add ("No action bound, no key or action specified!");
3085 $self->{binding_cancel}->()
3086 if $self->{binding_cancel};
3087 }
3088}
3089
3090sub start {
3091 my ($self) = @_;
3092
3093 $self->{rec_btn}->set_text ("stop recording");
3094 $self->{recording} = 1;
3095 $self->clear_command_list;
3096 $::CONN->start_record if $::CONN;
3097}
3098
3099sub stop {
3100 my ($self) = @_;
3101
3102 $self->{rec_btn}->set_text ("start recording");
3103 $self->{recording} = 0;
3104
3105 my $rec;
3106 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec);
3109}
3110
3111# if $commit is true, the binding will be set after the user entered a key combo
3112sub ask_for_bind {
3113 my ($self, $commit) = @_;
3114
3115 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_;
3117 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3118 $self->update_binding_widgets;
3119 $self->commit if $commit;
3120 }); 3600 });
3121} 3601}
3122 3602
3123# $mod and $sym are the modifiers and key symbol
3124# $cmds is a array ref of strings (the commands)
3125# $cb is the callback that is executed on OK
3126# $ccb is the callback that is executed on CANCEL and
3127# when the binding was unsuccessful on OK
3128sub set_binding {
3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3130
3131 $self->clear_command_list;
3132 $self->{recording} = 0;
3133 $self->{rec_btn}->set_text ("start recording");
3134
3135 $self->{binding} = [$mod, $sym];
3136 $self->{commands} = $cmds;
3137
3138 $self->{binding_change} = $cb;
3139 $self->{binding_cancel} = $ccb;
3140
3141 $self->update_binding_widgets;
3142}
3143
3144# this is a shortcut method that asks for a binding
3145# and then just binds it.
3146sub do_quick_binding {
3147 my ($self, $cmds) = @_;
3148 $self->set_binding (undef, undef, $cmds, sub {
3149 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3150 });
3151 $self->ask_for_bind (1);
3152}
3153
3154sub update_binding_widgets {
3155 my ($self) = @_;
3156 my ($mod, $sym, $cmds) = $self->get_binding;
3157 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3158 $self->set_command_list ($cmds);
3159}
3160
3161sub get_binding {
3162 my ($self) = @_;
3163 return (
3164 $self->{binding}->[0],
3165 $self->{binding}->[1],
3166 [ grep { defined $_ } @{$self->{commands}} ]
3167 );
3168}
3169
3170sub clear_command_list {
3171 my ($self) = @_;
3172 $self->{cmdbox}->clear ();
3173}
3174
3175sub set_command_list {
3176 my ($self, $cmds) = @_;
3177
3178 $self->{cmdbox}->clear ();
3179 $self->{commands} = $cmds;
3180
3181 my $idx = 0;
3182
3183 for (@$cmds) {
3184 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3185
3186 my $i = $idx;
3187 $hb->add (new CFClient::UI::Label text => $_);
3188 $hb->add (new CFClient::UI::Button
3189 text => "delete",
3190 tooltip => "Deletes the action from the record",
3191 on_activate => sub {
3192 $self->{cmdbox}->remove ($hb);
3193 $cmds->[$i] = undef;
3194 });
3195
3196
3197 $idx++
3198 }
3199}
3200
3201#############################################################################
3202
3203package CFClient::UI::SpellList;
3204
3205our @ISA = CFClient::UI::FancyFrame::;
3206
3207sub new {
3208 my $class = shift;
3209
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3211
3212 $self->add (new CFClient::UI::ScrolledWindow
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3214
3215 $self;
3216}
3217
3218# XXX: Do sorting? Argl...
3219sub add_spell { 3603sub add_spell {
3220 my ($self, $spell) = @_; 3604 my ($self, $spell) = @_;
3605
3221 $self->{spells}->{$spell->{name}} = $spell; 3606 $self->{spell}->{$spell->{name}} = $spell;
3222 3607 $self->rebuild_spell_list;
3223 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224 face => $spell->{face},
3225 can_hover => 1,
3226 can_events => 1,
3227 tooltip => $spell->{message});
3228
3229 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230 text => $spell->{name},
3231 can_hover => 1,
3232 can_events => 1,
3233 tooltip => $spell->{message},
3234 expand => 1);
3235
3236 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3239 expand => 1);
3240
3241 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242 text => "bind to key",
3243 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244}
3245
3246sub rebuild_spell_list {
3247 my ($self) = @_;
3248 $self->{tbl_idx} = 0;
3249 $self->add_spell ($_) for values %{$self->{spells}};
3250} 3608}
3251 3609
3252sub remove_spell { 3610sub remove_spell {
3253 my ($self, $spell) = @_; 3611 my ($self, $spell) = @_;
3612
3254 delete $self->{spells}->{$spell->{name}}; 3613 delete $self->{spell}->{$spell->{name}};
3255 $self->rebuild_spell_list; 3614 $self->rebuild_spell_list;
3256} 3615}
3257 3616
3617sub clear_spells {
3618 my ($self) = @_;
3619
3620 $self->{spell} = {};
3621 $self->rebuild_spell_list;
3622}
3623
3258############################################################################# 3624#############################################################################
3259 3625
3260package CFClient::UI::Root; 3626package CFClient::UI::Root;
3261 3627
3262our @ISA = CFClient::UI::Container::; 3628our @ISA = CFClient::UI::Container::;
3629
3630use List::Util qw(min max);
3263 3631
3264use CFClient::OpenGL; 3632use CFClient::OpenGL;
3265 3633
3266sub new { 3634sub new {
3267 my $class = shift; 3635 my $class = shift;
… …
3294 $coord = $max - $size if $coord > $max - $size; 3662 $coord = $max - $size if $coord > $max - $size;
3295 3663
3296 int $coord + 0.5 3664 int $coord + 0.5
3297} 3665}
3298 3666
3299sub size_allocate { 3667sub invoke_size_allocate {
3300 my ($self, $w, $h) = @_; 3668 my ($self, $w, $h) = @_;
3301 3669
3302 for my $child ($self->children) { 3670 for my $child ($self->children) {
3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3671 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3304 3672
… …
3308 $X = _to_pixel $X, $W, $self->{w}; 3676 $X = _to_pixel $X, $W, $self->{w};
3309 $Y = _to_pixel $Y, $H, $self->{h}; 3677 $Y = _to_pixel $Y, $H, $self->{h};
3310 3678
3311 $child->configure ($X, $Y, $W, $H); 3679 $child->configure ($X, $Y, $W, $H);
3312 } 3680 }
3681
3682 1
3313} 3683}
3314 3684
3315sub coord2local { 3685sub coord2local {
3316 my ($self, $x, $y) = @_; 3686 my ($self, $x, $y) = @_;
3317 3687
… …
3402 3772
3403 delete $queue{$widget+0}; 3773 delete $queue{$widget+0};
3404 3774
3405 my ($w, $h) = $widget->size_request; 3775 my ($w, $h) = $widget->size_request;
3406 3776
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3777 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3778 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3779
3780 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3781 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3409 3782
3410 $w = $widget->{force_w} if exists $widget->{force_w}; 3783 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h}; 3784 $h = $widget->{force_h} if exists $widget->{force_h};
3412 3785
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3786 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3471 glLoadIdentity; 3844 glLoadIdentity;
3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3845 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473 glMatrixMode GL_MODELVIEW; 3846 glMatrixMode GL_MODELVIEW;
3474 glLoadIdentity; 3847 glLoadIdentity;
3475 3848
3849 {
3850 package CFClient::UI::Base;
3851
3852 ($draw_x, $draw_y, $draw_w, $draw_h) =
3853 (0, 0, $self->{w}, $self->{h});
3854 }
3855
3476 $self->_draw; 3856 $self->_draw;
3477} 3857}
3478 3858
3479############################################################################# 3859#############################################################################
3480 3860

Diff Legend

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