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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 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}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
88 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
89 103
90 $GRAB = $widget; 104 $GRAB = $widget;
91 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
92 106
93 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
94 } 108 }
95 109
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 111
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
99 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
188 203
189 } 204 }
190 } 205 }
191 206
192 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
193} 216}
194 217
195############################################################################# 218#############################################################################
196 219
197package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $self->{x} = List::Util::max 0, int $x; 341 $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; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
333} 355}
334 356
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
338} 364}
339 365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
… …
366 392
367 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
368 } 394 }
369} 395}
370 396
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 397sub children {
376 # nop 398 # nop
377} 399}
378 400
379sub visible_children { 401sub visible_children {
… …
381} 403}
382 404
383sub set_max_size { 405sub set_max_size {
384 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
385 407
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
388} 412}
389 413
390sub set_tooltip { 414sub set_tooltip {
391 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
392 416
… …
397 421
398 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
399 423
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 427 }
404} 428}
405 429
406# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
407sub coord2local { 431sub coord2local {
… …
415 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
416 440
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 442}
419 443
420sub focus_in { 444sub invoke_focus_in {
421 my ($self) = @_; 445 my ($self) = @_;
422 446
423 return if $FOCUS == $self; 447 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
425 449
426 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
427 451
428 $self->_emit (focus_in => $focus); 452 $self->update;
429 453
430 $focus->update if $focus; 454 0
431 $FOCUS->update;
432} 455}
433 456
434sub focus_out { 457sub invoke_focus_out {
435 my ($self) = @_; 458 my ($self) = @_;
436 459
437 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
438 461
439 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
440 463
441 $self->_emit (focus_out => $focus); 464 $self->update;
442 465
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 467 unless $FOCUS;
447}
448 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
449sub mouse_motion { 0 } 479sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 480sub invoke_button_up { 0 }
451sub key_down { 0 } 481sub invoke_key_down { 0 }
452sub key_up { 0 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
453 484
454sub button_down { 485sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
456 487
457 $self->focus_in; 488 $self->grab_focus;
458 489
459 0 490 0
491}
492
493sub connect {
494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 513}
461 514
462sub find_widget { 515sub find_widget {
463 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
464 517
… …
474sub set_parent { 527sub set_parent {
475 my ($self, $parent) = @_; 528 my ($self, $parent) = @_;
476 529
477 Scalar::Util::weaken ($self->{parent} = $parent); 530 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 531 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 532}
503 533
504sub realloc { 534sub realloc {
505 my ($self) = @_; 535 my ($self) = @_;
506 536
… …
539 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
540 570
541 # update screen rectangle 571 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 574
547 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 578
551 glPushMatrix; 579 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 580 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 581
556 if ($self == $HOVER && $self->{can_hover}) { 582 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 584 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 586 glBegin GL_QUADS;
563 glVertex $x , $y; 587 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 588 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 589 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 590 glVertex 0 , $self->{h};
567 glEnd; 591 glEnd;
568 glDisable GL_BLEND; 592 glDisable GL_BLEND;
569 } 593 }
570 594
571 if ($ENV{CFPLUS_DEBUG} & 1) { 595 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 596 glPushMatrix;
573 glColor 1, 1, 0, 1; 597 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 598 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 599 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 600 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 601 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 602 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 603 glVertex 0 , $self->{h} - 1;
580 glEnd; 604 glEnd;
581 glPopMatrix; 605 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 607 }
608
609 $self->_draw;
610 glPopMatrix;
584} 611}
585 612
586sub _draw { 613sub _draw {
587 my ($self) = @_; 614 my ($self) = @_;
588 615
… …
590} 617}
591 618
592sub DESTROY { 619sub DESTROY {
593 my ($self) = @_; 620 my ($self) = @_;
594 621
622 return if CFClient::in_destruct;
623
595 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
596 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 628}
598 629
599############################################################################# 630#############################################################################
600 631
601package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
626 657
627 if ($color && (@$color < 4 || $color->[3])) { 658 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
629 660
630 glEnable GL_BLEND; 661 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 663 glColor_premultiply @$color;
633 664
634 glBegin GL_QUADS; 665 glBegin GL_QUADS;
635 glVertex 0 , 0; 666 glVertex 0 , 0;
636 glVertex 0 , $h; 667 glVertex 0 , $h;
637 glVertex $w, $h; 668 glVertex $w, $h;
… …
766} 797}
767 798
768sub add { 799sub add {
769 my ($self, $child) = @_; 800 my ($self, $child) = @_;
770 801
771 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
774} 804}
775 805
776sub remove { 806sub remove {
777 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
786 816
787sub size_request { 817sub size_request {
788 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
789} 819}
790 820
791sub size_allocate { 821sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
793 823
794 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
795} 827}
796 828
797############################################################################# 829#############################################################################
798 830
799# back-buffered drawing area 831# back-buffered drawing area
… …
815 847
816 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
817 $self->SUPER::update; 849 $self->SUPER::update;
818} 850}
819 851
820sub size_allocate { 852sub invoke_size_allocate {
821 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
822 854
823 $self->SUPER::size_allocate ($w, $h);
824 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
825} 858}
826 859
827sub _render { 860sub _render {
828 my ($self) = @_; 861 my ($self) = @_;
829 862
… …
856 my $tex = $self->{texture} 889 my $tex = $self->{texture}
857 or return; 890 or return;
858 891
859 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 894 glColor 0, 0, 0, 1;
862 895
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 897
865 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
866} 899}
… …
890 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
891 924
892 ($w, $h) 925 ($w, $h)
893} 926}
894 927
895sub size_allocate { 928sub invoke_size_allocate {
896 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
897 930
898 my $child = $self->child; 931 my $child = $self->child;
899 932
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902 935
903 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
904 $self->update; 937 $self->update;
938
939 1
905} 940}
906 941
907sub set_offset { 942sub set_offset {
908 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
909 944
… …
972 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
973 }, 1008 },
974 ; 1009 ;
975 1010
976 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
978 slider => $slider, 1014 slider => $slider,
979 %arg, 1015 %arg,
980 ); 1016 );
981 1017
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
984 1020
985 $self 1021 $self
986} 1022}
987 1023
1024#TODO# update range on size_allocate depending on child
1025
988sub add { 1026sub add {
989 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
990 1028
991 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
992} 1030}
993 1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
994sub update { 1048sub update {
995 my ($self) = @_; 1049 my ($self) = @_;
996 1050
997 $self->SUPER::update; 1051 $self->SUPER::update;
998 1052
999 # todo: overwrite size_allocate of child 1053 $self->update_slider;
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1054}
1003 1055
1004sub size_allocate { 1056sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1006 1058
1059 $self->update_slider;
1060
1007 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1008
1009 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1011} 1062}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1063
1016############################################################################# 1064#############################################################################
1017 1065
1018package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1019 1067
… …
1035 1083
1036 if ($self->{bg}) { 1084 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
1038 1086
1039 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
1042 1090
1043 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1092 glVertex 0 , 0;
1045 glVertex 0 , $h; 1093 glVertex 0 , $h;
1046 glVertex $w, $h; 1094 glVertex $w, $h;
… …
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1119
1072sub new { 1120sub new {
1073 my ($class, %arg) = @_; 1121 my ($class, %arg) = @_;
1074 1122
1075 my $title = delete $arg{title};
1076
1077 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1080 border => 0.6, 1126 border => 0.6,
1081 can_events => 1, 1127 can_events => 1,
1082 min_w => 16, 1128 min_w => 64,
1083 min_h => 16, 1129 min_h => 32,
1084 %arg, 1130 %arg,
1085 ); 1131 );
1086 1132
1087 $self->{title} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1088 align => 0, 1134 align => 0,
1089 valign => 1, 1135 valign => 1,
1090 text => $title, 1136 text => $self->{title},
1091 fontsize => $self->{border} 1137 fontsize => $self->{border},
1092 if defined $title; 1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
1093 1148
1094 $self 1149 $self
1095} 1150}
1096 1151
1097sub add { 1152sub add {
1098 my ($self, @widgets) = @_; 1153 my ($self, @widgets) = @_;
1099 1154
1100 $self->SUPER::add (@widgets); 1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102} 1158}
1103 1159
1104sub border { 1160sub border {
1105 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1106} 1162}
1107 1163
1108sub size_request { 1164sub size_request {
1109 my ($self) = @_; 1165 my ($self) = @_;
1110 1166
1111 $self->{title}->size_request 1167 $self->{title_widget}->size_request
1112 if $self->{title}; 1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1113 1172
1114 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1115 1174
1116 ( 1175 (
1117 $w + $self->border * 2, 1176 $w + $self->border * 2,
1118 $h + $self->border * 2, 1177 $h + $self->border * 2,
1119 ) 1178 )
1120} 1179}
1121 1180
1122sub size_allocate { 1181sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1124 1183
1125 if ($self->{title}) { 1184 if ($self->{title_widget}) {
1126 $self->{title}{w} = $w; 1185 $self->{title_widget}{w} = $w;
1127 $self->{title}{h} = $h; 1186 $self->{title_widget}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h); 1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1129 } 1188 }
1130 1189
1131 my $border = $self->border; 1190 my $border = $self->border;
1132 1191
1133 $h -= List::Util::max 0, $border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1134 $w -= List::Util::max 0, $border * 2; 1193 $w -= List::Util::max 0, $border * 2;
1194
1195 $self->child->configure ($border, $border, $w, $h);
1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1135 1207
1136 $self->child->configure ($border, $border, $w, $h); 1208 1
1137} 1209}
1138 1210
1139sub button_down { 1211sub invoke_button_down {
1140 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1141 1213
1142 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1143 my $border = $self->border; 1215 my $border = $self->border;
1144 1216
… …
1160 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
1161 1233
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1236
1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1238 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1239 };
1168 1240
1169 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
1175 1247
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1249
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1251 # HACK: the next line is required to enforce placement
1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1253 };
1180 } else { 1254 } else {
1181 return 0; 1255 return 0;
1182 } 1256 }
1183 1257
1184 1 1258 1
1185} 1259}
1186 1260
1187sub button_up { 1261sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1189 1263
1190 !!delete $self->{motion} 1264 ! ! delete $self->{motion}
1191} 1265}
1192 1266
1193sub mouse_motion { 1267sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1195 1269
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1271
1198 !!$self->{motion} 1272 ! ! $self->{motion}
1199} 1273}
1200 1274
1201sub _draw { 1275sub _draw {
1202 my ($self) = @_; 1276 my ($self) = @_;
1203 1277
… …
1229 1303
1230 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1231 1305
1232 $child->draw; 1306 $child->draw;
1233 1307
1234 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1237 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1238} 1317}
1239 1318
1240############################################################################# 1319#############################################################################
1241 1320
1242package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1265 1344
1266 $child->set_parent ($self); 1345 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1268 1347
1269 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1270} 1355}
1271 1356
1272# TODO: move to container class maybe? send children a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1273sub clear { 1358sub clear {
1274 my ($self) = @_; 1359 my ($self) = @_;
… …
1315 (sum @$ws), 1400 (sum @$ws),
1316 (sum @$hs), 1401 (sum @$hs),
1317 ) 1402 )
1318} 1403}
1319 1404
1320sub size_allocate { 1405sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1322 1407
1323 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1324 1409
1325 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1357 } 1442 }
1358 1443
1359 $y += $row_h; 1444 $y += $row_h;
1360 } 1445 }
1361 1446
1447 1
1362} 1448}
1363 1449
1364sub find_widget { 1450sub find_widget {
1365 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1366 1452
… …
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 ) 1491 )
1406} 1492}
1407 1493
1408sub size_allocate { 1494sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1410 1496
1411 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1413 1499
1414 my @req; 1500 my @req;
1415 1501
1416 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1418 } else { 1504 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1421 1507
1422 if ($req > $space) { 1508 if ($req > $space) {
1423 # ah well, not enough space 1509 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1425 } else { 1511 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1513
1428 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1429 1515
1430 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1517 for 0 .. $#children;
1432 } 1518 }
1433 } 1519 }
1434 1520
1435 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1436 1522
1437 my $pos = 0; 1523 my $pos = 0;
1438 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1441 1527
1442 $pos += $alloc; 1528 $pos += $alloc;
1443 } 1529 }
1444 1530
1445 1 1531 1
… …
1535 1621
1536 delete $self->{texture}; 1622 delete $self->{texture};
1537 $self->SUPER::update; 1623 $self->SUPER::update;
1538} 1624}
1539 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1540sub set_text { 1633sub set_text {
1541 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1542 1635
1543 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1545 1638
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1548 1640
1641 delete $self->{size_req};
1549 $self->realloc; 1642 $self->realloc;
1550 $self->update; 1643 $self->update;
1551} 1644}
1552 1645
1553sub set_markup { 1646sub set_markup {
… …
1556 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1558 1651
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1653
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1563 1655
1656 delete $self->{size_req};
1564 $self->realloc; 1657 $self->realloc;
1565 $self->update; 1658 $self->update;
1566} 1659}
1567 1660
1568sub size_request { 1661sub size_request {
1569 my ($self) = @_; 1662 my ($self) = @_;
1570 1663
1664 $self->{size_req} ||= do {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1670
1577 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1578 1672
1579 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1580 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1677
1583 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1584 1679
1585 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1587 } 1685 };
1588 1686
1589 ($w, $h) 1687 @{ $self->{size_req} }
1590} 1688}
1591 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1592sub size_allocate { 1694sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1594 1696
1595 delete $self->{ox}; 1697 delete $self->{ox};
1596 1698
1597 delete $self->{texture} 1699 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1599} 1703}
1600 1704
1601sub set_fontsize { 1705sub set_fontsize {
1602 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1603 1707
1604 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1605 delete $self->{texture}; 1710 delete $self->{texture};
1606 1711
1607 $self->realloc; 1712 $self->realloc;
1608} 1713}
1609 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1610sub _draw { 1724sub _draw {
1611 my ($self) = @_; 1725 my ($self) = @_;
1612 1726
1613 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1614 1728
1615 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1617 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1618 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1736
1623 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1624 }; 1738 };
1625 1739
1626 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1630 1744
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1634 }; 1748 };
1635 1749
1636 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1638 1752
1639 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1640 glColor @{$self->{fg}};
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645
1646 glDisable GL_TEXTURE_2D;
1647} 1754}
1648 1755
1649############################################################################# 1756#############################################################################
1650 1757
1651package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1665 can_hover => 1, 1772 can_hover => 1,
1666 can_focus => 1, 1773 can_focus => 1,
1667 valign => 0, 1774 valign => 0,
1668 can_events => 1, 1775 can_events => 1,
1669 #text => ... 1776 #text => ...
1777 #hidden => "*",
1670 @_ 1778 @_
1671 ) 1779 )
1672} 1780}
1673 1781
1674sub _set_text { 1782sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1790 $self->{text} = $text;
1683 1791
1684 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1686 1795
1687 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1688 $self->update; 1799 $self->update;
1689} 1800}
1690 1801
1691sub set_text { 1802sub set_text {
1692 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1693 1804
1694 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1806 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1807}
1699 1808
1700sub get_text { 1809sub get_text {
1701 $_[0]{text} 1810 $_[0]{text}
1702} 1811}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1708 1817
1709 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1710} 1819}
1711 1820
1712sub key_down { 1821sub invoke_key_down {
1713 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1714 1823
1715 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1729 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1730 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 1843 $self->emit ('escape');
1735 } elsif ($uni) { 1844 } elsif ($uni) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 1846 } else {
1738 return 0; 1847 return 0;
1739 } 1848 }
… …
1743 $self->realloc; 1852 $self->realloc;
1744 1853
1745 1 1854 1
1746} 1855}
1747 1856
1748sub focus_in { 1857sub invoke_focus_in {
1749 my ($self) = @_; 1858 my ($self) = @_;
1750 1859
1751 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1752 1861
1753 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1754} 1863}
1755 1864
1756sub button_down { 1865sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1758 1867
1759 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 1869
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 1871
1763 # byte-index to char-index 1872 # byte-index to char-index
1764 my $text = $self->{text}; 1873 my $text = $self->{text};
1765 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1767 1876
1768 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1769 $self->update; 1878 $self->update;
1770 1879
1771 1 1880 1
1772} 1881}
1773 1882
1774sub mouse_motion { 1883sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1776# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1777 1886
1778 0 1887 1
1779} 1888}
1780 1889
1781sub _draw { 1890sub _draw {
1782 my ($self) = @_; 1891 my ($self) = @_;
1783 1892
1784 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1785 1894
1786 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1789 } else { 1898 } else {
1790 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1791 } 1900 }
1792 1901
1793 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1796 glVertex 0 , 0; 1905 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1824 1933
1825our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1826 1935
1827use CFClient::OpenGL; 1936use CFClient::OpenGL;
1828 1937
1829sub key_down { 1938sub invoke_key_down {
1830 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1831 1940
1832 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1833 1942
1834 if ($sym == 13) { 1943 if ($sym == 13) {
1835 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1837 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1840 $self->update; 1950 $self->update;
1841 1951
1842 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1860 } else { 1970 } else {
1861 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1862 } 1972 }
1863 1973
1864 } else { 1974 } else {
1865 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1866 } 1976 }
1867 1977
1868 1 1978 1
1869} 1979}
1870 1980
… …
1894 can_events => 1, 2004 can_events => 1,
1895 @_ 2005 @_
1896 ) 2006 )
1897} 2007}
1898 2008
1899sub activate { }
1900
1901sub button_up { 2009sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1903 2011
1904 $self->emit ("activate") 2012 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1909} 2017}
1910 2018
1911sub _draw { 2019sub _draw {
1912 my ($self) = @_; 2020 my ($self) = @_;
1913 2021
1914 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 2023
1920 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1923 2027
1924 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1925 2029
1926 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1927 2031
1928 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
2033}
2034
2035#############################################################################
2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
1929} 2069}
1930 2070
1931############################################################################# 2071#############################################################################
1932 2072
1933package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1960 my ($self) = @_; 2100 my ($self) = @_;
1961 2101
1962 (6) x 2 2102 (6) x 2
1963} 2103}
1964 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1965sub button_down { 2113sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1967 2115
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2118 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2119 } else {
1973 return 0 2120 return 0
1974 } 2121 }
1975 2122
1976 1 2123 1
… …
2001package CFClient::UI::Image; 2148package CFClient::UI::Image;
2002 2149
2003our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
2004 2151
2005use CFClient::OpenGL; 2152use CFClient::OpenGL;
2006use Carp qw/confess/;
2007 2153
2008our %loaded_images; 2154our %texture_cache;
2009 2155
2010sub new { 2156sub new {
2011 my $class = shift; 2157 my $class = shift;
2012 2158
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2014 2163
2015 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2016 2166
2017 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2019 2169
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2021 2171
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2173
2026 $self 2174 $self
2027} 2175}
2028 2176
2029sub size_request { 2177sub size_request {
2030 my ($self) = @_; 2178 my ($self) = @_;
2031 2179
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2033} 2181}
2034 2182
2035sub _draw { 2183sub _draw {
2036 my ($self) = @_; 2184 my ($self) = @_;
2037 2185
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2296
2149 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2150 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2151 2302
2152 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2153 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2308
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
2173 2325
2174 if ($t3) { 2326 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2333 glEnd;
2182 } 2334 }
2183 2335
2184 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2272 $self->update; 2424 $self->update;
2273 2425
2274 $self 2426 $self
2275} 2427}
2276 2428
2277sub changed { }
2278
2279sub set_range { 2429sub set_range {
2280 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2281 2431
2282 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2283 2433
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2286} 2438}
2287 2439
2288sub set_value { 2440sub set_value {
2289 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2290 2442
… …
2301 if $unit; 2453 if $unit;
2302 2454
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 2456
2305 if ($value != $old_value) { 2457 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2307 $self->update; 2459 $self->update;
2308 } 2460 }
2309} 2461}
2310 2462
2311sub size_request { 2463sub size_request {
2312 my ($self) = @_; 2464 my ($self) = @_;
2313 2465
2314 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2315} 2467}
2316 2468
2317sub button_down { 2469sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2319 2471
2320 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 2473
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 2475
2324 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2325} 2477}
2326 2478
2327sub mouse_motion { 2479sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2329 2481
2330 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 2484
… …
2338 } else { 2490 } else {
2339 return 0; 2491 return 0;
2340 } 2492 }
2341 2493
2342 1 2494 1
2495}
2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2343} 2505}
2344 2506
2345sub update { 2507sub update {
2346 my ($self) = @_; 2508 my ($self) = @_;
2347 2509
… …
2437sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2439 2601
2440############################################################################# 2602#############################################################################
2441 2603
2442package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2443 2605
2444our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2445 2607
2446use CFClient::OpenGL; 2608use CFClient::OpenGL;
2447 2609
2448sub new { 2610sub new {
2449 my $class = shift; 2611 my $class = shift;
2450 2612
2451 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2452 fontsize => 1, 2614 fontsize => 1,
2453 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2454 #font => default_font 2617 #font => default_font
2455 @_, 2618 @_,
2456 2619
2457 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2458 par => [], 2621 par => [],
2459 height => 0, 2622 height => 0,
2460 children => [ 2623 children => [
2461 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2473 2636
2474 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2475 $self->reflow; 2638 $self->reflow;
2476} 2639}
2477 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2478sub size_allocate { 2650sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2480 2652
2481 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 2655
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2486 2660
2487 $self->reflow; 2661 $self->reflow;
2488}
2489 2662
2490sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2491 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2492 2679
2493 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2494 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2497 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2498 2693 );
2694
2499 $layout->size 2695 $layout
2500} 2696}
2501 2697
2502sub reflow { 2698sub reflow {
2503 my ($self) = @_; 2699 my ($self) = @_;
2504 2700
… …
2513 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2514} 2710}
2515 2711
2516sub clear { 2712sub clear {
2517 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2518 2717
2519 $self->{par} = []; 2718 $self->{par} = [];
2520 $self->{height} = 0; 2719 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 2721}
2523 2722
2524sub add_paragraph { 2723sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2526 2725
2527 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2528 my ($w, $h) = $self->text_size ($line); 2727
2529 $self->{height} += $h; 2728 $para = {
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2531 } 2735 };
2532 2736
2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2534} 2749}
2535 2750
2536sub update { 2751sub update {
2537 my ($self) = @_; 2752 my ($self) = @_;
2538 2753
… …
2540 2755
2541 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2542 2757
2543 delete $self->{texture}; 2758 delete $self->{texture};
2544 2759
2545 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 2762
2548 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2549 my $height = 0; 2764 my $height = 0;
2550 2765
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2557 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3]; 2770
2561 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2562 } 2774 }
2563 2775
2564 $height += $_->[1]; 2776 $height += $para->{h};
2565 } 2777 }
2566 2778
2567 $self->{height} = $height; 2779 $self->{height} = $height;
2568 2780
2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2570 2782
2571 delete $self->{texture}; 2783 delete $self->{texture};
2572 } 2784 }
2573 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2577 2793
2578 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2579 2795
2580 my $y0 = $top; 2796 my $y0 = $top;
2581 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2582 2798
2583 my $y = 0; 2799 my $y = 0;
2584 2800
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2593 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 2802 my $h = $para->{h};
2595 2803
2596 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] });
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 2805
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2602 2807
2603 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2605 } 2822 }
2606 2823
2607 $y += $h; 2824 $y += $h;
2608 } 2825 }
2609
2610 glDisable GL_BLEND;
2611 }; 2826 };
2612 }); 2827 });
2613} 2828}
2614 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2615sub _draw { 2839sub _draw {
2616 my ($self) = @_; 2840 my ($self) = @_;
2617 2841
2618 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2623 2847
2624 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2625
2626} 2849}
2627 2850
2628############################################################################# 2851#############################################################################
2629 2852
2630package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2721 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2722 2948
2723 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2724 markup => $tooltip, 2950 markup => $tooltip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 2963
2738 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2739} 2965}
2740 2966
2741sub size_allocate { 2967sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2743 2969
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 2971}
2746 2972
2747sub visibility_change { 2973sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2749 2975
2750 return unless $visible; 2976 return unless $visible;
2751 2977
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2754 or return; 2980 or return;
2755 2981
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 2983
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2760 2986
2761 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2762 }); 2988 });
2763} 2989}
2764 2990
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 3080
2855 if ($tex) { 3081 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2861 } 3087 }
2862} 3088}
2863 3089
2864sub DESTROY { 3090sub destroy {
2865 my ($self) = @_; 3091 my ($self) = @_;
2866 3092
2867 $self->{timer}->cancel 3093 $self->{timer}->cancel
2868 if $self->{timer}; 3094 if $self->{timer};
2869 3095
2870 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2871} 3097}
2872 3098
2873############################################################################# 3099#############################################################################
2874 3100
2875package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2896 ); 3122 );
2897 3123
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2899 3125
2900 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2902 3128
2903 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2904 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2905 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2906 can_hover => 1, 3146 can_hover => 1,
2907 can_events => 1, 3147 can_events => 1,
2908 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2909 } 3151 }
2910 3152
2911 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2912 3154
2913 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2918 3160
2919# popup given the event (must be a mouse button down event currently) 3161# popup given the event (must be a mouse button down event currently)
2920sub popup { 3162sub popup {
2921 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2922 3164
2923 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2924 3166
2925 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3168 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2928 3170
2929 $self->show; 3171 $self->show;
2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2931} 3173}
2932 3174
2933sub mouse_motion { 3175sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2935 3177
2936 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2939 3181
2940 0 3182 0
2941} 3183}
2942 3184
2943sub button_up { 3185sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2945 3187
2946 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3189 undef $GRAB;
2948 $self->hide; 3190 $self->hide;
2949 3191
2950 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3194 } else {
2953 return 0 3195 return 0
2954 } 3196 }
2955 3197
… …
2982 3224
2983 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3226 if @{ $self->{children} };
2985} 3227}
2986 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
2987sub set_current_page { 3235sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
2989 3237
2990 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3239 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
2993 3241
2994 $self->{current} = $widget; 3242 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3244
2997 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
2998 3246
2999 $self->realloc; 3247 $self->realloc;
3000} 3248}
3001 3249
3002sub visible_children { 3250sub visible_children {
… …
3007 my ($self) = @_; 3255 my ($self) = @_;
3008 3256
3009 $self->{current}->size_request 3257 $self->{current}->size_request
3010} 3258}
3011 3259
3012sub size_allocate { 3260sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3014 3262
3015 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3016} 3266}
3017 3267
3018sub _draw { 3268sub _draw {
3019 my ($self) = @_; 3269 my ($self) = @_;
3020 3270
… …
3055 ); 3305 );
3056 3306
3057 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3058} 3308}
3059 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3060sub set_current_page { 3316sub set_current_page {
3061 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3062 3318
3063 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 3320 $self->emit (page_changed => $self->{multiplexer}{current});
3065} 3321}
3066 3322
3067############################################################################# 3323#############################################################################
3068 3324
3069package CFClient::UI::Statusbox; 3325package CFClient::UI::Combobox;
3070 3326
3327use utf8;
3328
3071our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFClient::UI::Button::;
3072 3330
3073sub new { 3331sub new {
3074 my $class = shift; 3332 my $class = shift;
3075 3333
3076 $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3377}
3378
3379#############################################################################
3380
3381package CFClient::UI::Statusbox;
3382
3383our @ISA = CFClient::UI::VBox::;
3384
3385sub new {
3386 my $class = shift;
3387
3388 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 3389 fontsize => 0.8,
3078 @_, 3390 @_,
3079 ) 3391 );
3392
3393 Scalar::Util::weaken (my $this = $self);
3394
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396
3397 $self
3080} 3398}
3081 3399
3082sub reorder { 3400sub reorder {
3083 my ($self) = @_; 3401 my ($self) = @_;
3084 my $NOW = time; 3402 my $NOW = Time::HiRes::time;
3403
3404 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} };
3085 3408
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3411 }
3089 3412
… …
3092 my @items = sort { 3415 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
3096 3419
3420 $self->{timer}->interval (1);
3421
3097 my $count = 10 + 1; 3422 my $count = 10 + 1;
3098 for my $item (@items) { 3423 for my $item (@items) {
3099 last unless --$count; 3424 last unless --$count;
3100 3425
3101 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3430 : $item->{text};
3106 3431
… …
3114 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3445 can_events => 1,
3121 can_hover => 1 3446 can_hover => 1
3122 }; 3447 };
3448
3449 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3450 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3451 $label->update;
3452 $label->set_max_size (undef, $label->{req_h} * $diff)
3453 if $diff < 1;
3454 $self->{timer}->interval (1/30);
3455 } else {
3456 $label->{fg}[3] = $item->{fg}[3] || 1;
3457 }
3458
3459 push @widgets, $label;
3123 } 3460 }
3124 3461
3125 $self->clear; 3462 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
3127} 3464}
… …
3132 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
3134 3471
3135 return unless $text; 3472 return unless $text;
3136 3473
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3475
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3477
3141 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
3143 $item->{count}++; 3480 $item->{count}++;
3144 } else { 3481 } else {
3145 $item->{count} = 1; 3482 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3147 } 3484 }
3148 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3150 delete $item->{label}; 3487 delete $item->{label};
3151 } else { 3488 } else {
3152 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3153 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3159 count => 1, 3496 count => 1,
3160 %arg, 3497 %arg,
3161 }; 3498 };
3162 } 3499 }
3163 3500
3501 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 3502 $self->reorder;
3503 });
3165} 3504}
3166 3505
3167sub reconfigure { 3506sub reconfigure {
3168 my ($self) = @_; 3507 my ($self) = @_;
3169 3508
… …
3172 3511
3173 $self->reorder; 3512 $self->reorder;
3174 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3175} 3514}
3176 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
3177############################################################################# 3524#############################################################################
3178 3525
3179package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3180 3527
3181our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3182 3529
3183sub new { 3530sub new {
3184 my $class = shift; 3531 my $class = shift;
3185 3532
3186 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3188 @_, 3535 @_,
3189 ); 3536 );
3190 3537
3191 $self 3538 $self
3192} 3539}
3193 3540
3194sub set_items { 3541sub set_items {
3195 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3196 3543
3197 $self->{child}->clear; 3544 $self->clear;
3198 return unless $items; 3545 return unless $items;
3199 3546
3200 my @items = sort { 3547 my @items = sort {
3201 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3203 } @$items; 3550 } values %$items;
3204 3551
3205 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3206 3553
3207 my $row = 0; 3554 my $row = 0;
3208 for my $item (@items) { 3555 for my $item (@items) {
3209 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3210 3557
3211 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3214 3561
3215 $row++; 3562 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 } 3563 }
3414} 3564}
3415 3565
3416############################################################################# 3566#############################################################################
3417 3567
… …
3427 commands => [], 3577 commands => [],
3428 @_, 3578 @_,
3429 ) 3579 )
3430} 3580}
3431 3581
3432# XXX: Do sorting? Argl... 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3433sub add_spell { 3667sub add_spell {
3434 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3435 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3436 3671 $self->rebuild_spell_list;
3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464} 3672}
3465 3673
3466sub remove_spell { 3674sub remove_spell {
3467 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3468 delete $self->{spells}->{$spell->{name}}; 3677 delete $self->{spell}->{$spell->{name}};
3469 $self->rebuild_spell_list; 3678 $self->rebuild_spell_list;
3470} 3679}
3471 3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3472############################################################################# 3688#############################################################################
3473 3689
3474package CFClient::UI::Root; 3690package CFClient::UI::Root;
3475 3691
3476our @ISA = CFClient::UI::Container::; 3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3477 3695
3478use CFClient::OpenGL; 3696use CFClient::OpenGL;
3479 3697
3480sub new { 3698sub new {
3481 my $class = shift; 3699 my $class = shift;
… …
3508 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3509 3727
3510 int $coord + 0.5 3728 int $coord + 0.5
3511} 3729}
3512 3730
3513sub size_allocate { 3731sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3515 3733
3516 for my $child ($self->children) { 3734 for my $child ($self->children) {
3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518 3736
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3524 3742
3525 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3526 } 3744 }
3745
3746 1
3527} 3747}
3528 3748
3529sub coord2local { 3749sub coord2local {
3530 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3531 3751
… …
3616 3836
3617 delete $queue{$widget+0}; 3837 delete $queue{$widget+0};
3618 3838
3619 my ($w, $h) = $widget->size_request; 3839 my ($w, $h) = $widget->size_request;
3620 3840
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3842 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3843
3844 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3845 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 3846
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 3847 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 3848 $h = $widget->{force_h} if exists $widget->{force_h};
3626 3849
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3653 3876
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 3878
3656 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3657 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3658 3887
3659 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3661 3890
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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