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.309 by elmex, Wed Jun 21 12:59:23 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
… …
366 366
367 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
368 } 368 }
369} 369}
370 370
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
376} 377}
377 378
378sub set_max_size { 379sub set_max_size {
379 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
380 381
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
383} 386}
384 387
385sub set_tooltip { 388sub set_tooltip {
386 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
387 390
… …
392 395
393 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
394 397
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 401 }
399} 402}
400 403
401# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
402sub coord2local { 405sub coord2local {
… …
410 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
411 414
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 416}
414 417
415sub focus_in { 418sub invoke_focus_in {
416 my ($self) = @_; 419 my ($self) = @_;
417 420
418 return if $FOCUS == $self; 421 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
420 423
421 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
422 425
423 $self->_emit (focus_in => $focus);
424
425 $focus->update if $focus; 426 $focus->update if $focus;
426 $FOCUS->update; 427 $FOCUS->update;
427}
428 428
429 0
430}
431
429sub focus_out { 432sub invoke_focus_out {
430 my ($self) = @_; 433 my ($self) = @_;
431 434
432 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
433 436
434 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
435 438
436 $self->_emit (focus_out => $focus);
437
438 $focus->update if $focus; #? 439 $focus->update if $focus; #?
439 440
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 442 unless $FOCUS;
442}
443 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
444sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
445sub button_up { } 454sub invoke_button_up { 1 }
446sub key_down { } 455sub invoke_key_down { 1 }
447sub key_up { } 456sub invoke_key_up { 1 }
448 457
449sub button_down { 458sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
451 460
452 $self->focus_in; 461 $self->grab_focus;
453}
454 462
455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
459sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
460 480
461sub find_widget { 481sub find_widget {
462 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
463 483
464 return () unless $self->{can_events}; 484 return () unless $self->{can_events};
… …
473sub set_parent { 493sub set_parent {
474 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
475 495
476 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
477 $self->set_visible if $parent->{visible}; 497 $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} 498}
502 499
503sub realloc { 500sub realloc {
504 my ($self) = @_; 501 my ($self) = @_;
505 502
… …
526 523
527 $self->realloc; 524 $self->realloc;
528 $self->update; 525 $self->update;
529} 526}
530 527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531
531sub draw { 532sub draw {
532 my ($self) = @_; 533 my ($self) = @_;
533 534
534 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
535 546
536 glPushMatrix; 547 glPushMatrix;
537 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
538 $self->_draw;
539 glPopMatrix;
540 549
541 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
542 my ($x, $y) = @$self{qw(x y)};
543
544 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
545 glEnable GL_BLEND; 552 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glBegin GL_QUADS; 554 glBegin GL_QUADS;
548 glVertex $x , $y; 555 glVertex 0 , 0;
549 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
550 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
551 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
552 glEnd; 559 glEnd;
553 glDisable GL_BLEND; 560 glDisable GL_BLEND;
554 } 561 }
555 562
556 if ($ENV{CFPLUS_DEBUG} & 1) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
557 glPushMatrix; 564 glPushMatrix;
558 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
560 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
561 glVertex 0 , 0; 568 glVertex 0 , 0;
562 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
563 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
564 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
565 glEnd; 572 glEnd;
566 glPopMatrix; 573 glPopMatrix;
567 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
568 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
569} 579}
570 580
571sub _draw { 581sub _draw {
572 my ($self) = @_; 582 my ($self) = @_;
573 583
… …
576 586
577sub DESTROY { 587sub DESTROY {
578 my ($self) = @_; 588 my ($self) = @_;
579 589
580 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
581 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
582} 594}
583 595
584############################################################################# 596#############################################################################
585 597
586package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
611 623
612 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
613 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
614 626
615 glEnable GL_BLEND; 627 glEnable GL_BLEND;
616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
617 glColor @$color; 629 glColor_premultiply @$color;
618 630
619 glBegin GL_QUADS; 631 glBegin GL_QUADS;
620 glVertex 0 , 0; 632 glVertex 0 , 0;
621 glVertex 0 , $h; 633 glVertex 0 , $h;
622 glVertex $w, $h; 634 glVertex $w, $h;
… …
653our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
654 666
655sub new { 667sub new {
656 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
657 669
658 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
659 671
660 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
661 children => [], 673 children => [],
662 can_events => 0, 674 can_events => 0,
663 %arg, 675 %arg,
664 ); 676 );
677
665 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
666 680
667 $self 681 $self
668} 682}
669 683
670sub add { 684sub add {
… …
718 $x -= $self->{x}; 732 $x -= $self->{x};
719 $y -= $self->{y}; 733 $y -= $self->{y};
720 734
721 my $res; 735 my $res;
722 736
723 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
724 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
725 and return $res; 739 and return $res;
726 } 740 }
727 741
728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
749} 763}
750 764
751sub add { 765sub add {
752 my ($self, $child) = @_; 766 my ($self, $child) = @_;
753 767
754 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
755
756 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
757} 770}
758 771
759sub remove { 772sub remove {
760 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
769 782
770sub size_request { 783sub size_request {
771 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
772} 785}
773 786
774sub size_allocate { 787sub invoke_size_allocate {
775 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
776 789
777 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
778} 793}
779 794
780############################################################################# 795#############################################################################
796
797# back-buffered drawing area
781 798
782package CFClient::UI::Window; 799package CFClient::UI::Window;
783 800
784our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
785 802
… …
796 813
797 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
798 $self->SUPER::update; 815 $self->SUPER::update;
799} 816}
800 817
801sub size_allocate { 818sub invoke_size_allocate {
802 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
803 820
804 $self->SUPER::size_allocate ($w, $h);
805 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
806} 824}
807 825
808sub _render { 826sub _render {
827 my ($self) = @_;
828
809 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
810} 830}
811 831
812sub render_child { 832sub render_child {
813 my ($self) = @_; 833 my ($self) = @_;
814 834
815 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
816 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
817 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
818 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
819 $self->_render; 846 $self->_render;
820 }; 847 };
821} 848}
822 849
823sub _draw { 850sub _draw {
824 my ($self) = @_; 851 my ($self) = @_;
825 852
826 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
827 854
828 my $tex = $self->{texture} 855 my $tex = $self->{texture}
829 or return; 856 or return;
830 857
831 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
833 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
834 861
835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
836 863
837 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
838} 865}
… …
862 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
863 890
864 ($w, $h) 891 ($w, $h)
865} 892}
866 893
867sub size_allocate { 894sub invoke_size_allocate {
868 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
869 896
870 my $child = $self->child; 897 my $child = $self->child;
871 898
872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
874 901
875 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
876 $self->update; 903 $self->update;
904
905 1
877} 906}
878 907
879sub set_offset { 908sub set_offset {
880 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
881 910
… …
914} 943}
915 944
916sub _render { 945sub _render {
917 my ($self) = @_; 946 my ($self) = @_;
918 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
919 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
920 952
921 $self->SUPER::_render; 953 $self->SUPER::_render;
922} 954}
923 955
… …
926package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
927 959
928our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
929 961
930sub new { 962sub new {
931 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
932 966
933 my $self; 967 my $self;
934 968
935 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
936 vertical => 1, 970 vertical => 1,
… …
941 ; 975 ;
942 976
943 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
944 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
945 slider => $slider, 979 slider => $slider,
946 @_, 980 %arg,
947 ); 981 );
948 982
949 $self->{vp}->add ($self->{scrolled});
950 $self->add ($self->{vp});
951 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
952 985
953 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
954} 993}
955 994
956sub update { 995sub update {
957 my ($self) = @_; 996 my ($self) = @_;
958 997
… …
961 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
962 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
963 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
964} 1003}
965 1004
966sub size_allocate { 1005sub invoke_size_allocate {
967 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
968
969 $self->SUPER::size_allocate ($w, $h);
970 1007
971 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
972 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
973} 1012}
974 1013
975#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
976# update viewport offset on scroll 1015# update viewport offset on scroll
977 1016
… …
997 1036
998 if ($self->{bg}) { 1037 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1000 1039
1001 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1003 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1004 1043
1005 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1006 glVertex 0 , 0; 1045 glVertex 0 , 0;
1007 glVertex 0 , $h; 1046 glVertex 0 , $h;
1008 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1030my @border = 1069my @border =
1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 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); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1033 1072
1034sub new { 1073sub new {
1035 my $class = shift; 1074 my ($class, %arg) = @_;
1036 1075
1037 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1038 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1039 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1040 border => 0.6, 1079 border => 0.6,
1041 can_events => 1, 1080 can_events => 1,
1042 min_w => 16, 1081 min_w => 16,
1043 min_h => 16, 1082 min_h => 16,
1044 @_ 1083 %arg,
1045 ); 1084 );
1046 1085
1047 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1048 align => 0, 1087 align => 0,
1049 valign => 1, 1088 valign => 1,
1050 text => $self->{title}, 1089 text => $self->{title},
1051 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 image => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1052 1101
1053 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1054} 1111}
1055 1112
1056sub border { 1113sub border {
1057 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1058} 1115}
1059 1116
1060sub size_request { 1117sub size_request {
1061 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1062 1125
1063 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1064 1127
1065 ( 1128 (
1066 $w + $self->border * 2, 1129 $w + $self->border * 2,
1067 $h + $self->border * 2, 1130 $h + $self->border * 2,
1068 ) 1131 )
1069} 1132}
1070 1133
1071sub size_allocate { 1134sub invoke_size_allocate {
1072 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1073 1136
1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1142
1143 my $border = $self->border;
1144
1074 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1075 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1076 1147
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); 1148 $self->child->configure ($border, $border, $w, $h);
1081}
1082 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1083sub button_down { 1156sub invoke_button_down {
1084 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1085 1158
1086 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1087 my $border = $self->border; 1160 my $border = $self->border;
1088 1161
… …
1104 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1105 1178
1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1109 $self->realloc; 1183 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1111 }; 1184 };
1112 1185
1113 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1114 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1115 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1118 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1119 1192
1120 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1121 1194
1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1123 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1124 } 1203 1
1125} 1204}
1126 1205
1127sub button_up { 1206sub invoke_button_up {
1128 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1129 1208
1130 delete $self->{motion}; 1209 ! ! delete $self->{motion}
1131} 1210}
1132 1211
1133sub mouse_motion { 1212sub invoke_mouse_motion {
1134 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1135 1214
1136 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
1137} 1218}
1138 1219
1139sub _draw { 1220sub _draw {
1140 my ($self) = @_; 1221 my ($self) = @_;
1141 1222
1223 my $child = $self->{children}[0];
1224
1142 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1144 1227
1145 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147 1230
1148 my $border = $self->border; 1231 my $border = $self->border;
… …
1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 } 1247 }
1165 1248
1166 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1167 1250
1168 $self->{title}->draw if $self->{title};
1169
1170 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1171} 1262}
1172 1263
1173############################################################################# 1264#############################################################################
1174 1265
1175package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1198 1289
1199 $child->set_parent ($self); 1290 $child->set_parent ($self);
1200 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1201 1292
1202 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1203} 1300}
1204 1301
1205# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1206sub clear { 1303sub clear {
1207 my ($self) = @_; 1304 my ($self) = @_;
… …
1248 (sum @$ws), 1345 (sum @$ws),
1249 (sum @$hs), 1346 (sum @$hs),
1250 ) 1347 )
1251} 1348}
1252 1349
1253sub size_allocate { 1350sub invoke_size_allocate {
1254 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1255 1352
1256 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1257 1354
1258 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1290 } 1387 }
1291 1388
1292 $y += $row_h; 1389 $y += $row_h;
1293 } 1390 }
1294 1391
1392 1
1295} 1393}
1296 1394
1297sub find_widget { 1395sub find_widget {
1298 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1299 1397
… …
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 ) 1436 )
1339} 1437}
1340 1438
1341sub size_allocate { 1439sub invoke_size_allocate {
1342 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1343 1441
1344 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1345 my $children = $self->{children}; 1443 my $children = $self->{children};
1346 1444
… …
1468 1566
1469 delete $self->{texture}; 1567 delete $self->{texture};
1470 $self->SUPER::update; 1568 $self->SUPER::update;
1471} 1569}
1472 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1473sub set_text { 1578sub set_text {
1474 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1475 1580
1476 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1478 1583
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1481 1586
1587 delete $self->{size_req};
1482 $self->realloc; 1588 $self->realloc;
1483 $self->update; 1589 $self->update;
1484} 1590}
1485 1591
1486sub set_markup { 1592sub set_markup {
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1599
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1496 1602
1603 delete $self->{size_req};
1497 $self->realloc; 1604 $self->realloc;
1498 $self->update; 1605 $self->update;
1499} 1606}
1500 1607
1501sub size_request { 1608sub size_request {
1502 my ($self) = @_; 1609 my ($self) = @_;
1503 1610
1611 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1617
1510 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1511 1619
1512 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1623
1516 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1517 1625
1518 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1520 } 1631 };
1521 1632
1522 ($w, $h) 1633 @{ $self->{size_req} }
1523} 1634}
1524 1635
1525sub size_allocate { 1636sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1638
1639 delete $self->{ox};
1527 1640
1528 delete $self->{texture} 1641 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1530} 1645}
1531 1646
1532sub set_fontsize { 1647sub set_fontsize {
1533 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1534 1649
1535 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1536 delete $self->{texture}; 1651 delete $self->{texture};
1537 1652
1538 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1539} 1662}
1540 1663
1541sub _draw { 1664sub _draw {
1542 my ($self) = @_; 1665 my ($self) = @_;
1543 1666
… …
1549 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553 1676
1554 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1555 1679
1680 unless (exists $self->{ox}) {
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1559 1684
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1563
1564 $tex
1565 }; 1688 };
1566 1689
1567 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1569 1694
1570 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1571 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1572 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1573 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1574 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1575 } 1702 }
1576 1703
1577 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1578} 1705}
1579 1706
… …
1596 can_hover => 1, 1723 can_hover => 1,
1597 can_focus => 1, 1724 can_focus => 1,
1598 valign => 0, 1725 valign => 0,
1599 can_events => 1, 1726 can_events => 1,
1600 #text => ... 1727 #text => ...
1728 #hidden => "*",
1601 @_ 1729 @_
1602 ) 1730 )
1603} 1731}
1604 1732
1605sub _set_text { 1733sub _set_text {
… …
1607 1735
1608 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1609 1737
1610 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1611 1739
1612 delete $self->{texture};
1613
1614 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1615 $self->{text} = $text; 1741 $self->{text} = $text;
1616 1742
1617 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1618 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1619 1746
1620 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1621} 1751}
1622 1752
1623sub set_text { 1753sub set_text {
1624 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1625 1755
1626 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1627 $self->_set_text ($text); 1757 $self->_set_text ($text);
1628
1629 $self->realloc;
1630} 1758}
1631 1759
1632sub get_text { 1760sub get_text {
1633 $_[0]{text} 1761 $_[0]{text}
1634} 1762}
… …
1639 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1640 1768
1641 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1642} 1770}
1643 1771
1644sub key_down { 1772sub invoke_key_down {
1645 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1646 1774
1647 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1648 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1649 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1661 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1662 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1663 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1664 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1665 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1666 $self->_emit ('escape'); 1794 $self->emit ('escape');
1667 } elsif ($uni) { 1795 } elsif ($uni) {
1668 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1669 } 1799 }
1670 1800
1671 $self->_set_text ($text); 1801 $self->_set_text ($text);
1672 1802
1673 $self->realloc; 1803 $self->realloc;
1674}
1675 1804
1805 1
1806}
1807
1676sub focus_in { 1808sub invoke_focus_in {
1677 my ($self) = @_; 1809 my ($self) = @_;
1678 1810
1679 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1680 1812
1681 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1682} 1814}
1683 1815
1684sub button_down { 1816sub invoke_button_down {
1685 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1686 1818
1687 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1688 1820
1689 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1690 1822
1691 # byte-index to char-index 1823 # byte-index to char-index
1692 my $text = $self->{text}; 1824 my $text = $self->{text};
1693 utf8::encode $text; 1825 utf8::encode $text;
1694 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1695 1827
1696 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1697 $self->update; 1829 $self->update;
1830
1831 1
1698} 1832}
1699 1833
1700sub mouse_motion { 1834sub invoke_mouse_motion {
1701 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1702# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1703} 1839}
1704 1840
1705sub _draw { 1841sub _draw {
1706 my ($self) = @_; 1842 my ($self) = @_;
1707 1843
1708 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1709 1845
1710 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1711 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1712 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1713 } else { 1849 } else {
1714 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1715 } 1851 }
1716 1852
1717 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1719 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1720 glVertex 0 , 0; 1856 glVertex 0 , 0;
1721 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1722 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1723 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1748 1884
1749our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1750 1886
1751use CFClient::OpenGL; 1887use CFClient::OpenGL;
1752 1888
1753sub key_down { 1889sub invoke_key_down {
1754 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1755 1891
1756 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1757 1893
1758 if ($sym == 13) { 1894 if ($sym == 13) {
1759 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1760 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1761 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1762 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1763 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1764 $self->update; 1901 $self->update;
1765 1902
1766 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1767 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1768 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1784 } else { 1921 } else {
1785 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1786 } 1923 }
1787 1924
1788 } else { 1925 } else {
1789 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1790 } 1929 1
1791
1792} 1930}
1793 1931
1794############################################################################# 1932#############################################################################
1795 1933
1796package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1817 can_events => 1, 1955 can_events => 1,
1818 @_ 1956 @_
1819 ) 1957 )
1820} 1958}
1821 1959
1822sub activate { }
1823
1824sub button_up { 1960sub invoke_button_up {
1825 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1826 1962
1827 $self->emit ("activate") 1963 $self->emit ("activate")
1828 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1829 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
1966
1967 1
1830} 1968}
1831 1969
1832sub _draw { 1970sub _draw {
1833 my ($self) = @_; 1971 my ($self) = @_;
1834 1972
1835 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1836
1837 if ($GRAB == $self) {
1838 $self->{fg} = $self->{active_fg};
1839 }
1840 1974
1841 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1843 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1844 1978
1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1846 1980
1847 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1848 1982
1849 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1850} 2020}
1851 2021
1852############################################################################# 2022#############################################################################
1853 2023
1854package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1881 my ($self) = @_; 2051 my ($self) = @_;
1882 2052
1883 (6) x 2 2053 (6) x 2
1884} 2054}
1885 2055
1886sub button_down { 2056sub invoke_button_down {
1887 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1888 2058
1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1892 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1893 } 2067 1
1894} 2068}
1895 2069
1896sub _draw { 2070sub _draw {
1897 my ($self) = @_; 2071 my ($self) = @_;
1898 2072
… …
2065 2239
2066 my $h1 = $self->{h} * (1 - $ycut1); 2240 my $h1 = $self->{h} * (1 - $ycut1);
2067 my $h2 = $self->{h} * (1 - $ycut2); 2241 my $h2 = $self->{h} * (1 - $ycut2);
2068 2242
2069 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2070 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2071 glEnable GL_TEXTURE_2D; 2246 glEnable GL_TEXTURE_2D;
2072 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2073 2248
2074 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2249 glBindTexture GL_TEXTURE_2D, $t1->{name};
2075 glBegin GL_QUADS; 2250 glBegin GL_QUADS;
… …
2189 $self->update; 2364 $self->update;
2190 2365
2191 $self 2366 $self
2192} 2367}
2193 2368
2194sub changed { }
2195
2196sub set_range { 2369sub set_range {
2197 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2198 2371
2199 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2200 2373
2201 $self->update
2202 if "@$range" ne "@{$self->{range}}"; 2374 if ("@$range" ne "@{$self->{range}}") {
2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2203} 2378}
2204 2379
2205sub set_value { 2380sub set_value {
2206 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2207 2382
… …
2218 if $unit; 2393 if $unit;
2219 2394
2220 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2221 2396
2222 if ($value != $old_value) { 2397 if ($value != $old_value) {
2223 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2224 $self->update; 2399 $self->update;
2225 } 2400 }
2226} 2401}
2227 2402
2228sub size_request { 2403sub size_request {
2229 my ($self) = @_; 2404 my ($self) = @_;
2230 2405
2231 ($self->{req_w}, $self->{req_h}) 2406 ($self->{req_w}, $self->{req_h})
2232} 2407}
2233 2408
2234sub button_down { 2409sub invoke_button_down {
2235 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2236 2411
2237 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2238 2413
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2415
2241 $self->mouse_motion ($ev, $x, $y); 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2242} 2417}
2243 2418
2244sub mouse_motion { 2419sub invoke_mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2246 2421
2247 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2249 2424
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2425 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2426
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2427 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2428
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2429 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430 } else {
2431 return 0;
2432 }
2433
2255 } 2434 1
2256} 2435}
2257 2436
2258sub update { 2437sub update {
2259 my ($self) = @_; 2438 my ($self) = @_;
2260 2439
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2440 delete $self->{knob_w};
2441 $self->SUPER::update;
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2448 $self->set_value ($self->{range}[0]);
2263 2449
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2450 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2451 my $range = ($hi - $page - $lo) || 1e-100;
2266 2452
… …
2272 $value = ($value - $lo) / $range; 2458 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2459 $value = $value * $self->{scale} + $self->{offset};
2274 2460
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2461 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2462 $self->{knob_w} = $knob_w;
2277 }); 2463 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2464
2285 $self->SUPER::_draw (); 2465 $self->SUPER::_draw ();
2286 2466
2287 glScale $self->{w}, $self->{h}; 2467 glScale $self->{w}, $self->{h};
2288 2468
… …
2349sub set_range { shift->{slider}->set_range (@_) } 2529sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) } 2530sub set_value { shift->{slider}->set_value (@_) }
2351 2531
2352############################################################################# 2532#############################################################################
2353 2533
2354package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2355 2535
2356our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2357 2537
2358use CFClient::OpenGL; 2538use CFClient::OpenGL;
2359 2539
… …
2361 my $class = shift; 2541 my $class = shift;
2362 2542
2363 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2364 fontsize => 1, 2544 fontsize => 1,
2365 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2366 #font => default_font 2547 #font => default_font
2367 @_, 2548 @_,
2368 2549
2369 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2370 par => [], 2551 par => [],
… …
2385 2566
2386 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2387 $self->reflow; 2568 $self->reflow;
2388} 2569}
2389 2570
2390sub size_allocate { 2571sub invoke_size_allocate {
2391 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2392
2393 $self->SUPER::size_allocate ($w, $h);
2394 2573
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 2578
2399 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2400} 2582}
2401 2583
2402sub text_size { 2584sub text_size {
2403 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2404 2586
2405 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2406 2588
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent); 2590 $layout->set_width ($self->{children}[0]{w} - $indent);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2409 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2410 2593
2411 $layout->size 2594 $layout->size
2412} 2595}
2413 2596
… …
2452 2635
2453 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2454 2637
2455 delete $self->{texture}; 2638 delete $self->{texture};
2456 2639
2457 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459 2642
2460 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2461 my $height = 0; 2644 my $height = 0;
2462 2645
… …
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466 2649
2467 for (@{$self->{par}}) { 2650 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]); 2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 $layout->set_markup ($_->[4]); 2654 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size; 2655 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3]; 2656 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h; 2657 $_->[1] = $h;
2474 } 2658 }
… …
2477 } 2661 }
2478 2662
2479 $self->{height} = $height; 2663 $self->{height} = $height;
2480 2664
2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2482 2666
2483 delete $self->{texture}; 2667 delete $self->{texture};
2484 } 2668 }
2485 2669
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2671 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2672 glClear GL_COLOR_BUFFER_BIT;
2489 2673
2490 my $top = int $self->{children}[1]{range}[0]; 2674 my $top = int $self->{children}[1]{range}[0];
2491 2675
2492 my $y0 = $top; 2676 my $y0 = $top;
… …
2506 my $h = $par->[1]; 2690 my $h = $par->[1];
2507 2691
2508 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] }); 2693 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511 $layout->set_markup ($par->[4]); 2696 $layout->set_markup ($par->[4]);
2512 2697
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2514 2699
2515 glRasterPos $par->[3], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
… …
2527sub _draw { 2712sub _draw {
2528 my ($self) = @_; 2713 my ($self) = @_;
2529 2714
2530 glEnable GL_TEXTURE_2D; 2715 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2717 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2535 2720
2536 $self->{children}[1]->draw; 2721 $self->{children}[1]->draw;
2537 2722
2538} 2723}
… …
2629 $tooltip .= "\n\n" . (ref $widget) . "\n" 2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n" 2816 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}"; 2817 . "visible $widget->{visible}";
2633 } 2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2634 2822
2635 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2636 markup => $tooltip, 2824 markup => $tooltip,
2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2638 fontsize => 0.8, 2826 fontsize => 0.8,
… …
2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2649 2837
2650 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2651} 2839}
2652 2840
2653sub size_allocate { 2841sub invoke_size_allocate {
2654 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2655 2843
2656 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2657} 2845}
2658 2846
2659sub visibility_change { 2847sub invoke_visibility_change {
2660 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2661 2849
2662 return unless $visible; 2850 return unless $visible;
2663 2851
2664 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2666 or return; 2854 or return;
2667 2855
2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2669 2857
2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2671 if $x + $self->{w} > $::WIDTH; 2859 if $x + $self->{w} > $self->{root}{w};
2672 2860
2673 $self->move_abs ($x, $y); 2861 $self->move_abs ($x, $y);
2674 }); 2862 });
2675} 2863}
2676 2864
… …
2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2766 2954
2767 if ($tex) { 2955 if ($tex) {
2768 glEnable GL_TEXTURE_2D; 2956 glEnable GL_TEXTURE_2D;
2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2770 glColor 1, 1, 1, 1; 2958 glColor 0, 0, 0, 1;
2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2772 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2773 } 2961 }
2774} 2962}
2775 2963
2776sub DESTROY { 2964sub destroy {
2777 my ($self) = @_; 2965 my ($self) = @_;
2778 2966
2779 $self->{timer}->cancel 2967 $self->{timer}->cancel
2780 if $self->{timer}; 2968 if $self->{timer};
2781 2969
2782 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2783} 2971}
2972
2973#############################################################################
2974
2975package CFClient::UI::Buttonbar;
2976
2977our @ISA = CFClient::UI::HBox::;
2978
2979# TODO: should actualyl wrap buttons and other goodies.
2784 2980
2785############################################################################# 2981#############################################################################
2786 2982
2787package CFClient::UI::Menu; 2983package CFClient::UI::Menu;
2788 2984
… …
2800 ); 2996 );
2801 2997
2802 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2803 2999
2804 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2805 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2806 3002
2807 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2808 if (!ref $widget) { 3004 if (!ref $widget) {
2809 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2810 can_hover => 1, 3006 can_hover => 1,
2811 can_events => 1, 3007 can_events => 1,
2812 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2813 } 3010 }
2814 3011
2815 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2816 3013
2817 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2822 3019
2823# popup given the event (must be a mouse button down event currently) 3020# popup given the event (must be a mouse button down event currently)
2824sub popup { 3021sub popup {
2825 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2826 3023
2827 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2828 3025
2829 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2830 $GRAB = $self; 3027 $GRAB = $self;
2831 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2832 3029
2833 $self->show; 3030 $self->show;
2834 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2835} 3032}
2836 3033
2837sub mouse_motion { 3034sub invoke_mouse_motion {
2838 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2839 3036
2840 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2841 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2843}
2844 3040
3041 0
3042}
3043
2845sub button_up { 3044sub invoke_button_up {
2846 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2847 3046
2848 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2849 undef $GRAB; 3048 undef $GRAB;
2850 $self->hide; 3049 $self->hide;
2851 3050
2852 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2853 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
3053 } else {
3054 return 0
3055 }
3056
2854 } 3057 1
2855} 3058}
2856 3059
2857############################################################################# 3060#############################################################################
2858 3061
2859package CFClient::UI::Statusbox; 3062package CFClient::UI::Multiplexer;
2860 3063
2861our @ISA = CFClient::UI::VBox::; 3064our @ISA = CFClient::UI::Container::;
2862 3065
2863sub new { 3066sub new {
2864 my $class = shift; 3067 my $class = shift;
2865 3068
2866 $class->SUPER::new ( 3069 my $self = $class->SUPER::new (
3070 @_,
3071 );
3072
3073 $self->{current} = $self->{children}[0]
3074 if @{ $self->{children} };
3075
3076 $self
3077}
3078
3079sub add {
3080 my ($self, @widgets) = @_;
3081
3082 $self->SUPER::add (@widgets);
3083
3084 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} };
3086}
3087
3088sub set_current_page {
3089 my ($self, $page_or_widget) = @_;
3090
3091 my $widget = ref $page_or_widget
3092 ? $page_or_widget
3093 : $self->{children}[$page_or_widget];
3094
3095 $self->{current} = $widget;
3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3097
3098 $self->emit (page_changed => $self->{current});
3099
3100 $self->realloc;
3101}
3102
3103sub visible_children {
3104 $_[0]{current}
3105}
3106
3107sub size_request {
3108 my ($self) = @_;
3109
3110 $self->{current}->size_request
3111}
3112
3113sub invoke_size_allocate {
3114 my ($self, $w, $h) = @_;
3115
3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3119}
3120
3121sub _draw {
3122 my ($self) = @_;
3123
3124 $self->{current}->draw;
3125}
3126
3127#############################################################################
3128
3129package CFClient::UI::Notebook;
3130
3131our @ISA = CFClient::UI::VBox::;
3132
3133sub new {
3134 my $class = shift;
3135
3136 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self
3140 @_,
3141 );
3142
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3144 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3145
3146 $self
3147}
3148
3149sub add {
3150 my ($self, $title, $widget, $tooltip) = @_;
3151
3152 Scalar::Util::weaken $self;
3153
3154 $self->{buttonbar}->add (new CFClient::UI::Button
3155 markup => $title,
3156 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) },
3158 );
3159
3160 $self->{multiplexer}->add ($widget);
3161}
3162
3163sub set_current_page {
3164 my ($self, $page) = @_;
3165
3166 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current});
3168}
3169
3170#############################################################################
3171
3172package CFClient::UI::Combobox;
3173
3174use utf8;
3175
3176our @ISA = CFClient::UI::Button::;
3177
3178sub new {
3179 my $class = shift;
3180
3181 my $self = $class->SUPER::new (
3182 options => [], # [value, title, longdesc], ...
3183 value => undef,
3184 @_,
3185 );
3186
3187 $self->_set_value ($self->{value});
3188
3189 $self
3190}
3191
3192sub invoke_button_down {
3193 my ($self, $ev) = @_;
3194
3195 my @menu_items;
3196
3197 for (@{ $self->{options} }) {
3198 my ($value, $title, $tooltip) = @$_;
3199
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 }
3202
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204}
3205
3206sub _set_value {
3207 my ($self, $value) = @_;
3208
3209 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3210 or return;
3211
3212 $self->{value} = $item->[0];
3213 $self->set_markup ("$item->[1] ⇓");
3214 $self->set_tooltip ($item->[2]);
3215}
3216
3217sub set_value {
3218 my ($self, $value) = @_;
3219
3220 return unless $self->{value} ne $value;
3221
3222 $self->_set_value ($value);
3223 $self->emit (changed => $value);
3224}
3225
3226#############################################################################
3227
3228package CFClient::UI::Statusbox;
3229
3230our @ISA = CFClient::UI::VBox::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
2867 fontsize => 0.8, 3236 fontsize => 0.8,
2868 @_, 3237 @_,
2869 ) 3238 );
3239
3240 Scalar::Util::weaken (my $this = $self);
3241
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243
3244 $self
2870} 3245}
2871 3246
2872sub reorder { 3247sub reorder {
2873 my ($self) = @_; 3248 my ($self) = @_;
2874 my $NOW = time; 3249 my $NOW = Time::HiRes::time;
3250
3251 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} };
2875 3255
2876 while (my ($k, $v) = each %{ $self->{item} }) { 3256 while (my ($k, $v) = each %{ $self->{item} }) {
2877 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3257 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878 } 3258 }
2879 3259
… …
2882 my @items = sort { 3262 my @items = sort {
2883 $a->{pri} <=> $b->{pri} 3263 $a->{pri} <=> $b->{pri}
2884 or $b->{id} <=> $a->{id} 3264 or $b->{id} <=> $a->{id}
2885 } values %{ $self->{item} }; 3265 } values %{ $self->{item} };
2886 3266
3267 $self->{timer}->interval (1);
3268
2887 my $count = 10 + 1; 3269 my $count = 10 + 1;
2888 for my $item (@items) { 3270 for my $item (@items) {
2889 last unless --$count; 3271 last unless --$count;
2890 3272
2891 push @widgets, $item->{label} ||= do { 3273 my $label = $item->{label} ||= do {
2892 # TODO: doesn't handle markup well (read as: at all) 3274 # TODO: doesn't handle markup well (read as: at all)
2893 my $short = $item->{count} > 1 3275 my $short = $item->{count} > 1
2894 ? "<b>$item->{count} ×</b> $item->{text}" 3276 ? "<b>$item->{count} ×</b> $item->{text}"
2895 : $item->{text}; 3277 : $item->{text};
2896 3278
… …
2904 tooltip => $item->{tooltip}, 3286 tooltip => $item->{tooltip},
2905 tooltip_font => $::FONT_PROP, 3287 tooltip_font => $::FONT_PROP,
2906 tooltip_width => 0.67, 3288 tooltip_width => 0.67,
2907 fontsize => $item->{fontsize} || $self->{fontsize}, 3289 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44, 3290 max_w => $::WIDTH * 0.44,
2909 fg => $item->{fg}, 3291 fg => [@{ $item->{fg} }],
2910 can_events => 1, 3292 can_events => 1,
2911 can_hover => 1 3293 can_hover => 1
2912 }; 3294 };
3295
3296 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3297 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3298 $label->update;
3299 $label->set_max_size (undef, $label->{req_h} * $diff)
3300 if $diff < 1;
3301 $self->{timer}->interval (1/30);
3302 } else {
3303 $label->{fg}[3] = $item->{fg}[3] || 1;
3304 }
3305
3306 push @widgets, $label;
2913 } 3307 }
2914 3308
2915 $self->clear; 3309 $self->clear;
2916 $self->SUPER::add (reverse @widgets); 3310 $self->SUPER::add (reverse @widgets);
2917} 3311}
… …
2922 $text =~ s/^\s+//; 3316 $text =~ s/^\s+//;
2923 $text =~ s/\s+$//; 3317 $text =~ s/\s+$//;
2924 3318
2925 return unless $text; 3319 return unless $text;
2926 3320
2927 my $timeout = time + ((delete $arg{timeout}) || 60); 3321 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2928 3322
2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3323 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2930 3324
2931 if (my $item = $self->{item}{$group}) { 3325 if (my $item = $self->{item}{$group}) {
2932 if ($item->{text} eq $text) { 3326 if ($item->{text} eq $text) {
2933 $item->{count}++; 3327 $item->{count}++;
2934 } else { 3328 } else {
2935 $item->{count} = 1; 3329 $item->{count} = 1;
2936 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
2937 } 3331 }
2938 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
2939 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
2940 delete $item->{label}; 3334 delete $item->{label};
2941 } else { 3335 } else {
2942 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
2943 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
2962 3356
2963 $self->reorder; 3357 $self->reorder;
2964 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
2965} 3359}
2966 3360
3361sub destroy {
3362 my ($self) = @_;
3363
3364 $self->{timer}->cancel;
3365
3366 $self->SUPER::destroy;
3367}
3368
2967############################################################################# 3369#############################################################################
2968 3370
2969package CFClient::UI::Inventory; 3371package CFClient::UI::Inventory;
2970 3372
2971our @ISA = CFClient::UI::ScrolledWindow::; 3373our @ISA = CFClient::UI::ScrolledWindow::;
2972 3374
2973sub new { 3375sub new {
2974 my $class = shift; 3376 my $class = shift;
2975 3377
2976 my $self = $class->SUPER::new ( 3378 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978 @_, 3380 @_,
2979 ); 3381 );
2980 3382
2981 $self 3383 $self
2982} 3384}
2983 3385
2984sub set_items { 3386sub set_items {
2985 my ($self, $items) = @_; 3387 my ($self, $items) = @_;
2986 3388
2987 $self->{scrolled}->clear; 3389 $self->{child}->clear;
2988 return unless $items; 3390 return unless $items;
2989 3391
2990 my @items = sort { 3392 my @items = sort {
2991 ($a->{type} <=> $b->{type}) 3393 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name}) 3394 or ($a->{name} cmp $b->{name})
… …
2996 3398
2997 my $row = 0; 3399 my $row = 0;
2998 for my $item (@items) { 3400 for my $item (@items) {
2999 CFClient::Item::update_widgets $item; 3401 CFClient::Item::update_widgets $item;
3000 3402
3001 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3403 $self->{child}->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3404 $self->{child}->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3405 $self->{child}->add (2, $row, $item->{weight_widget});
3004 3406
3005 $row++; 3407 $row++;
3006 } 3408 }
3007} 3409}
3008 3410
… …
3070 $self->update_binding_widgets; 3472 $self->update_binding_widgets;
3071 3473
3072 $self 3474 $self
3073} 3475}
3074 3476
3477sub cfg_bind {
3478 my ($self, $mod, $sym, $cmds) = @_;
3479 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3480 ::update_bindings ();
3481}
3482
3483sub cfg_unbind {
3484 my ($self, $mod, $sym, $cmds) = @_;
3485 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3486 ::update_bindings ();
3487}
3488
3075sub commit { 3489sub commit {
3076 my ($self) = @_; 3490 my ($self) = @_;
3077 my ($mod, $sym, $cmds) = $self->get_binding; 3491 my ($mod, $sym, $cmds) = $self->get_binding;
3078 if ($sym != 0 && @$cmds > 0) { 3492 if ($sym != 0 && @$cmds > 0) {
3079 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3493 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3106 $rec = $::CONN->stop_record if $::CONN; 3520 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY'; 3521 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec); 3522 $self->set_command_list ($rec);
3109} 3523}
3110 3524
3111# if $commit is true, the binding will be set after the user entered a key combo 3525
3526sub ask_for_bind_and_commit {
3527 my ($self) = @_;
3528 $self->ask_for_bind (1);
3529}
3530
3112sub ask_for_bind { 3531sub ask_for_bind {
3113 my ($self, $commit) = @_; 3532 my ($self, $commit, $end_cb) = @_;
3114 3533
3115 CFClient::Binder::open_binding_dialog (sub { 3534 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_; 3535 my ($mod, $sym) = @_;
3117 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3536 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3118 $self->update_binding_widgets; 3537 $self->update_binding_widgets;
3119 $self->commit if $commit; 3538 $self->commit if $commit;
3539 $end_cb->() if $end_cb;
3120 }); 3540 });
3121} 3541}
3122 3542
3123# $mod and $sym are the modifiers and key symbol 3543# $mod and $sym are the modifiers and key symbol
3124# $cmds is a array ref of strings (the commands) 3544# $cmds is a array ref of strings (the commands)
… …
3142} 3562}
3143 3563
3144# this is a shortcut method that asks for a binding 3564# this is a shortcut method that asks for a binding
3145# and then just binds it. 3565# and then just binds it.
3146sub do_quick_binding { 3566sub do_quick_binding {
3147 my ($self, $cmds) = @_; 3567 my ($self, $cmds, $end_cb) = @_;
3148 $self->set_binding (undef, undef, $cmds, sub { 3568 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3149 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3150 });
3151 $self->ask_for_bind (1); 3569 $self->ask_for_bind (1, $end_cb);
3152} 3570}
3153 3571
3154sub update_binding_widgets { 3572sub update_binding_widgets {
3155 my ($self) = @_; 3573 my ($self) = @_;
3156 my ($mod, $sym, $cmds) = $self->get_binding; 3574 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3200 3618
3201############################################################################# 3619#############################################################################
3202 3620
3203package CFClient::UI::SpellList; 3621package CFClient::UI::SpellList;
3204 3622
3205our @ISA = CFClient::UI::FancyFrame::; 3623our @ISA = CFClient::UI::Table::;
3206 3624
3207sub new { 3625sub new {
3208 my $class = shift; 3626 my $class = shift;
3209 3627
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3628 my $self = $class->SUPER::new (
3211 3629 binding => [],
3212 $self->add (new CFClient::UI::ScrolledWindow 3630 commands => [],
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3631 @_,
3214 3632 )
3215 $self;
3216} 3633}
3217 3634
3218# XXX: Do sorting? Argl... 3635my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3636
3637my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3639my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3641my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3642 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3643my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3645my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3647
3648sub rebuild_spell_list {
3649 my ($self) = @_;
3650
3651 $CFClient::UI::ROOT->on_refresh ($self => sub {
3652 $self->clear;
3653
3654 return unless $::CONN;
3655
3656 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3657 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3658 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3659 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3660 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3661
3662 my $row = 0;
3663
3664 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3665 my $spell = $self->{spell}{$_};
3666
3667 $row++;
3668
3669 my $spell_cb = sub {
3670 my ($widget, $ev) = @_;
3671
3672 if ($ev->{button} == 1) {
3673 $::CONN->user_send ("cast $spell->{name}");
3674 } elsif ($ev->{button} == 2) {
3675 $::CONN->user_send ("invoke $spell->{name}");
3676 } elsif ($ev->{button} == 3) {
3677 (new CFClient::UI::Menu
3678 items => [
3679 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3680 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3681 ],
3682 )->popup ($ev);
3683 } else {
3684 return 0;
3685 }
3686
3687 1
3688 };
3689
3690 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3691
3692 #TODO: add path info to tooltip
3693 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3694
3695 $self->add (0, $row, new CFClient::UI::Face
3696 face => $spell->{face},
3697 can_hover => 1,
3698 can_events => 1,
3699 tooltip => $tooltip,
3700 on_button_down => $spell_cb,
3701 );
3702
3703 $self->add (1, $row, new CFClient::UI::Label
3704 expand => 1,
3705 text => $spell->{name},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3713 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3714 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3715 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3716 }
3717 });
3718}
3719
3219sub add_spell { 3720sub add_spell {
3220 my ($self, $spell) = @_; 3721 my ($self, $spell) = @_;
3722
3221 $self->{spells}->{$spell->{name}} = $spell; 3723 $self->{spell}->{$spell->{name}} = $spell;
3222 3724 $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} 3725}
3251 3726
3252sub remove_spell { 3727sub remove_spell {
3253 my ($self, $spell) = @_; 3728 my ($self, $spell) = @_;
3729
3254 delete $self->{spells}->{$spell->{name}}; 3730 delete $self->{spell}->{$spell->{name}};
3255 $self->rebuild_spell_list; 3731 $self->rebuild_spell_list;
3256} 3732}
3257 3733
3734sub clear_spells {
3735 my ($self) = @_;
3736
3737 $self->{spell} = {};
3738 $self->rebuild_spell_list;
3739}
3740
3258############################################################################# 3741#############################################################################
3259 3742
3260package CFClient::UI::Root; 3743package CFClient::UI::Root;
3261 3744
3262our @ISA = CFClient::UI::Container::; 3745our @ISA = CFClient::UI::Container::;
3746
3747use List::Util qw(min max);
3263 3748
3264use CFClient::OpenGL; 3749use CFClient::OpenGL;
3265 3750
3266sub new { 3751sub new {
3267 my $class = shift; 3752 my $class = shift;
… …
3294 $coord = $max - $size if $coord > $max - $size; 3779 $coord = $max - $size if $coord > $max - $size;
3295 3780
3296 int $coord + 0.5 3781 int $coord + 0.5
3297} 3782}
3298 3783
3299sub size_allocate { 3784sub invoke_size_allocate {
3300 my ($self, $w, $h) = @_; 3785 my ($self, $w, $h) = @_;
3301 3786
3302 for my $child ($self->children) { 3787 for my $child ($self->children) {
3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3788 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3304 3789
… …
3308 $X = _to_pixel $X, $W, $self->{w}; 3793 $X = _to_pixel $X, $W, $self->{w};
3309 $Y = _to_pixel $Y, $H, $self->{h}; 3794 $Y = _to_pixel $Y, $H, $self->{h};
3310 3795
3311 $child->configure ($X, $Y, $W, $H); 3796 $child->configure ($X, $Y, $W, $H);
3312 } 3797 }
3798
3799 1
3313} 3800}
3314 3801
3315sub coord2local { 3802sub coord2local {
3316 my ($self, $x, $y) = @_; 3803 my ($self, $x, $y) = @_;
3317 3804
… …
3402 3889
3403 delete $queue{$widget+0}; 3890 delete $queue{$widget+0};
3404 3891
3405 my ($w, $h) = $widget->size_request; 3892 my ($w, $h) = $widget->size_request;
3406 3893
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3894 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3895 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3896
3897 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3898 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3409 3899
3410 $w = $widget->{force_w} if exists $widget->{force_w}; 3900 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h}; 3901 $h = $widget->{force_h} if exists $widget->{force_h};
3412 3902
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3903 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3471 glLoadIdentity; 3961 glLoadIdentity;
3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3962 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473 glMatrixMode GL_MODELVIEW; 3963 glMatrixMode GL_MODELVIEW;
3474 glLoadIdentity; 3964 glLoadIdentity;
3475 3965
3966 {
3967 package CFClient::UI::Base;
3968
3969 ($draw_x, $draw_y, $draw_w, $draw_h) =
3970 (0, 0, $self->{w}, $self->{h});
3971 }
3972
3476 $self->_draw; 3973 $self->_draw;
3477} 3974}
3478 3975
3479############################################################################# 3976#############################################################################
3480 3977

Diff Legend

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