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.277 by root, Sun Jun 4 00:21:52 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
… …
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);
1179 # HACK: the next line is required to enforce placement 1251 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1181 }; 1253 };
1182 } else { 1254 } else {
1183 return 0; 1255 return 0;
1184 } 1256 }
1185 1257
1186 1 1258 1
1187} 1259}
1188 1260
1189sub button_up { 1261sub invoke_button_up {
1190 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1191 1263
1192 !!delete $self->{motion} 1264 ! ! delete $self->{motion}
1193} 1265}
1194 1266
1195sub mouse_motion { 1267sub invoke_mouse_motion {
1196 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1197 1269
1198 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199 1271
1200 !!$self->{motion} 1272 ! ! $self->{motion}
1201} 1273}
1202 1274
1203sub _draw { 1275sub _draw {
1204 my ($self) = @_; 1276 my ($self) = @_;
1205 1277
… …
1231 1303
1232 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1233 1305
1234 $child->draw; 1306 $child->draw;
1235 1307
1236 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1237 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1239 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1240} 1317}
1241 1318
1242############################################################################# 1319#############################################################################
1243 1320
1244package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1267 1344
1268 $child->set_parent ($self); 1345 $child->set_parent ($self);
1269 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1270 1347
1271 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1272} 1355}
1273 1356
1274# 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?
1275sub clear { 1358sub clear {
1276 my ($self) = @_; 1359 my ($self) = @_;
… …
1317 (sum @$ws), 1400 (sum @$ws),
1318 (sum @$hs), 1401 (sum @$hs),
1319 ) 1402 )
1320} 1403}
1321 1404
1322sub size_allocate { 1405sub invoke_size_allocate {
1323 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1324 1407
1325 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1326 1409
1327 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1359 } 1442 }
1360 1443
1361 $y += $row_h; 1444 $y += $row_h;
1362 } 1445 }
1363 1446
1447 1
1364} 1448}
1365 1449
1366sub find_widget { 1450sub find_widget {
1367 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1368 1452
… …
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 ) 1491 )
1408} 1492}
1409 1493
1410sub size_allocate { 1494sub invoke_size_allocate {
1411 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1412 1496
1413 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1414 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1415 1499
1416 my @req; 1500 my @req;
1417 1501
1418 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1419 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1420 } else { 1504 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1422 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1423 1507
1424 if ($req > $space) { 1508 if ($req > $space) {
1425 # ah well, not enough space 1509 # ah well, not enough space
1426 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1427 } else { 1511 } else {
1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1429 1513
1430 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1431 1515
1432 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1433 for 0 .. $#$children; 1517 for 0 .. $#children;
1434 } 1518 }
1435 } 1519 }
1436 1520
1437 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1438 1522
1439 my $pos = 0; 1523 my $pos = 0;
1440 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1441 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1442 $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));
1443 1527
1444 $pos += $alloc; 1528 $pos += $alloc;
1445 } 1529 }
1446 1530
1447 1 1531 1
… …
1537 1621
1538 delete $self->{texture}; 1622 delete $self->{texture};
1539 $self->SUPER::update; 1623 $self->SUPER::update;
1540} 1624}
1541 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1542sub set_text { 1633sub set_text {
1543 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1544 1635
1545 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1547 1638
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1550 1640
1641 delete $self->{size_req};
1551 $self->realloc; 1642 $self->realloc;
1552 $self->update; 1643 $self->update;
1553} 1644}
1554 1645
1555sub set_markup { 1646sub set_markup {
… …
1558 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1559 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1560 1651
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1653
1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1564 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1565 1655
1656 delete $self->{size_req};
1566 $self->realloc; 1657 $self->realloc;
1567 $self->update; 1658 $self->update;
1568} 1659}
1569 1660
1570sub size_request { 1661sub size_request {
1571 my ($self) = @_; 1662 my ($self) = @_;
1572 1663
1664 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 1670
1579 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1580 1672
1581 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1582 $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);
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 1677
1585 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1586 1679
1587 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1589 } 1685 };
1590 1686
1591 ($w, $h) 1687 @{ $self->{size_req} }
1592} 1688}
1593 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1594sub size_allocate { 1694sub invoke_size_allocate {
1595 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1596 1696
1597 delete $self->{ox}; 1697 delete $self->{ox};
1598 1698
1599 delete $self->{texture} 1699 delete $self->{texture}
1600 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
1601} 1703}
1602 1704
1603sub set_fontsize { 1705sub set_fontsize {
1604 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1605 1707
1606 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1607 delete $self->{texture}; 1710 delete $self->{texture};
1608 1711
1609 $self->realloc; 1712 $self->realloc;
1610} 1713}
1611 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1612sub _draw { 1724sub _draw {
1613 my ($self) = @_; 1725 my ($self) = @_;
1614 1726
1615 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1616 1728
1617 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1618 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1619 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1620 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1621 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1624 1736
1625 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1626 }; 1738 };
1627 1739
1628 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1631 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1632 1744
1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1636 }; 1748 };
1637 1749
1638 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1640 1752
1641 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1642 glColor @{$self->{fg}};
1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1644 } else {
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646 }
1647
1648 glDisable GL_TEXTURE_2D;
1649} 1754}
1650 1755
1651############################################################################# 1756#############################################################################
1652 1757
1653package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1667 can_hover => 1, 1772 can_hover => 1,
1668 can_focus => 1, 1773 can_focus => 1,
1669 valign => 0, 1774 valign => 0,
1670 can_events => 1, 1775 can_events => 1,
1671 #text => ... 1776 #text => ...
1777 #hidden => "*",
1672 @_ 1778 @_
1673 ) 1779 )
1674} 1780}
1675 1781
1676sub _set_text { 1782sub _set_text {
… …
1683 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1790 $self->{text} = $text;
1685 1791
1686 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1688 1795
1689 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1690 $self->update; 1799 $self->update;
1691} 1800}
1692 1801
1693sub set_text { 1802sub set_text {
1694 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1695 1804
1696 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 1806 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 1807}
1701 1808
1702sub get_text { 1809sub get_text {
1703 $_[0]{text} 1810 $_[0]{text}
1704} 1811}
… …
1709 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1710 1817
1711 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1712} 1819}
1713 1820
1714sub key_down { 1821sub invoke_key_down {
1715 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1716 1823
1717 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1718 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1719 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1731 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1732 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1733 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1734 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1735 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1736 $self->_emit ('escape'); 1843 $self->emit ('escape');
1737 } elsif ($uni) { 1844 } elsif ($uni) {
1738 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else { 1846 } else {
1740 return 0; 1847 return 0;
1741 } 1848 }
… …
1745 $self->realloc; 1852 $self->realloc;
1746 1853
1747 1 1854 1
1748} 1855}
1749 1856
1750sub focus_in { 1857sub invoke_focus_in {
1751 my ($self) = @_; 1858 my ($self) = @_;
1752 1859
1753 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1754 1861
1755 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1756} 1863}
1757 1864
1758sub button_down { 1865sub invoke_button_down {
1759 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1760 1867
1761 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1762 1869
1763 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1764 1871
1765 # byte-index to char-index 1872 # byte-index to char-index
1766 my $text = $self->{text}; 1873 my $text = $self->{text};
1767 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1768 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1769 1876
1770 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1771 $self->update; 1878 $self->update;
1772 1879
1773 1 1880 1
1774} 1881}
1775 1882
1776sub mouse_motion { 1883sub invoke_mouse_motion {
1777 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1778# 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#
1779 1886
1780 0 1887 1
1781} 1888}
1782 1889
1783sub _draw { 1890sub _draw {
1784 my ($self) = @_; 1891 my ($self) = @_;
1785 1892
1786 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1787 1894
1788 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1791 } else { 1898 } else {
1792 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1793 } 1900 }
1794 1901
1795 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1798 glVertex 0 , 0; 1905 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1826 1933
1827our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1828 1935
1829use CFClient::OpenGL; 1936use CFClient::OpenGL;
1830 1937
1831sub key_down { 1938sub invoke_key_down {
1832 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1833 1940
1834 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1835 1942
1836 if ($sym == 13) { 1943 if ($sym == 13) {
1837 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1838 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1839 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1840 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1841 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1842 $self->update; 1950 $self->update;
1843 1951
1844 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1845 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1846 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1862 } else { 1970 } else {
1863 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1864 } 1972 }
1865 1973
1866 } else { 1974 } else {
1867 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1868 } 1976 }
1869 1977
1870 1 1978 1
1871} 1979}
1872 1980
… …
1896 can_events => 1, 2004 can_events => 1,
1897 @_ 2005 @_
1898 ) 2006 )
1899} 2007}
1900 2008
1901sub activate { }
1902
1903sub button_up { 2009sub invoke_button_up {
1904 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1905 2011
1906 $self->emit ("activate") 2012 $self->emit ("activate")
1907 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1908 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1911} 2017}
1912 2018
1913sub _draw { 2019sub _draw {
1914 my ($self) = @_; 2020 my ($self) = @_;
1915 2021
1916 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921 2023
1922 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1925 2027
1926 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1927 2029
1928 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1929 2031
1930 $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
1931} 2069}
1932 2070
1933############################################################################# 2071#############################################################################
1934 2072
1935package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1962 my ($self) = @_; 2100 my ($self) = @_;
1963 2101
1964 (6) x 2 2102 (6) x 2
1965} 2103}
1966 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1967sub button_down { 2113sub invoke_button_down {
1968 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1969 2115
1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1972 $self->{state} = !$self->{state}; 2118 $self->toggle;
1973 $self->_emit (changed => $self->{state});
1974 } else { 2119 } else {
1975 return 0 2120 return 0
1976 } 2121 }
1977 2122
1978 1 2123 1
… …
2003package CFClient::UI::Image; 2148package CFClient::UI::Image;
2004 2149
2005our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
2006 2151
2007use CFClient::OpenGL; 2152use CFClient::OpenGL;
2008use Carp qw/confess/;
2009 2153
2010our %loaded_images; 2154our %texture_cache;
2011 2155
2012sub new { 2156sub new {
2013 my $class = shift; 2157 my $class = shift;
2014 2158
2015 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2016 2163
2017 $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";
2018 2166
2019 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2020 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;
2021 2169
2022 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2023 2171
2024 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2025
2026 $self->{aspect} = $tex->{w} / $tex->{h};
2027 2173
2028 $self 2174 $self
2029} 2175}
2030 2176
2031sub size_request { 2177sub size_request {
2032 my ($self) = @_; 2178 my ($self) = @_;
2033 2179
2034 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2035} 2181}
2036 2182
2037sub _draw { 2183sub _draw {
2038 my ($self) = @_; 2184 my ($self) = @_;
2039 2185
… …
2148 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2149 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2150 2296
2151 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2152 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);
2153 2302
2154 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2155 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;
2156 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2308
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
2175 2325
2176 if ($t3) { 2326 if ($t3) {
2177 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2178 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2179 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2180 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2181 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2182 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2183 glEnd; 2333 glEnd;
2184 } 2334 }
2185 2335
2186 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2274 $self->update; 2424 $self->update;
2275 2425
2276 $self 2426 $self
2277} 2427}
2278 2428
2279sub changed { }
2280
2281sub set_range { 2429sub set_range {
2282 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2283 2431
2284 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2285 2433
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2288} 2438}
2289 2439
2290sub set_value { 2440sub set_value {
2291 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2292 2442
… …
2303 if $unit; 2453 if $unit;
2304 2454
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306 2456
2307 if ($value != $old_value) { 2457 if ($value != $old_value) {
2308 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2309 $self->update; 2459 $self->update;
2310 } 2460 }
2311} 2461}
2312 2462
2313sub size_request { 2463sub size_request {
2314 my ($self) = @_; 2464 my ($self) = @_;
2315 2465
2316 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2317} 2467}
2318 2468
2319sub button_down { 2469sub invoke_button_down {
2320 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2321 2471
2322 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2323 2473
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325 2475
2326 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2327} 2477}
2328 2478
2329sub mouse_motion { 2479sub invoke_mouse_motion {
2330 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2331 2481
2332 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334 2484
… …
2340 } else { 2490 } else {
2341 return 0; 2491 return 0;
2342 } 2492 }
2343 2493
2344 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
2345} 2505}
2346 2506
2347sub update { 2507sub update {
2348 my ($self) = @_; 2508 my ($self) = @_;
2349 2509
… …
2439sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2441 2601
2442############################################################################# 2602#############################################################################
2443 2603
2444package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2445 2605
2446our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2447 2607
2448use CFClient::OpenGL; 2608use CFClient::OpenGL;
2449 2609
2450sub new { 2610sub new {
2451 my $class = shift; 2611 my $class = shift;
2452 2612
2453 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2454 fontsize => 1, 2614 fontsize => 1,
2455 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2456 #font => default_font 2617 #font => default_font
2457 @_, 2618 @_,
2458 2619
2459 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2460 par => [], 2621 par => [],
2461 height => 0, 2622 height => 0,
2462 children => [ 2623 children => [
2463 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2464 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2475 2636
2476 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2477 $self->reflow; 2638 $self->reflow;
2478} 2639}
2479 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
2480sub size_allocate { 2650sub invoke_size_allocate {
2481 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2482 2652
2483 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2484 2655
2485 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $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});
2488 2660
2489 $self->reflow; 2661 $self->reflow;
2490}
2491 2662
2492sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2493 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) = @_;
2494 2679
2495 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2496 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $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});
2499 $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}}
2500 2693 );
2694
2501 $layout->size 2695 $layout
2502} 2696}
2503 2697
2504sub reflow { 2698sub reflow {
2505 my ($self) = @_; 2699 my ($self) = @_;
2506 2700
… …
2515 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2516} 2710}
2517 2711
2518sub clear { 2712sub clear {
2519 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2520 2717
2521 $self->{par} = []; 2718 $self->{par} = [];
2522 $self->{height} = 0; 2719 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524} 2721}
2525 2722
2526sub add_paragraph { 2723sub add_paragraph {
2527 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2528 2725
2529 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2530 my ($w, $h) = $self->text_size ($line); 2727
2531 $self->{height} += $h; 2728 $para = {
2532 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,
2533 } 2735 };
2534 2736
2535 $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;
2536} 2749}
2537 2750
2538sub update { 2751sub update {
2539 my ($self) = @_; 2752 my ($self) = @_;
2540 2753
… …
2542 2755
2543 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2544 2757
2545 delete $self->{texture}; 2758 delete $self->{texture};
2546 2759
2547 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549 2762
2550 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2551 my $height = 0; 2764 my $height = 0;
2552 2765
2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2557 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2559 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3]; 2770
2563 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2564 } 2774 }
2565 2775
2566 $height += $_->[1]; 2776 $height += $para->{h};
2567 } 2777 }
2568 2778
2569 $self->{height} = $height; 2779 $self->{height} = $height;
2570 2780
2571 $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]);
2572 2782
2573 delete $self->{texture}; 2783 delete $self->{texture};
2574 } 2784 }
2575 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2579 2793
2580 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2581 2795
2582 my $y0 = $top; 2796 my $y0 = $top;
2583 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2584 2798
2585 my $y = 0; 2799 my $y = 0;
2586 2800
2587 my $layout = $self->{layout};
2588
2589 $layout->set_font ($self->{font}) if $self->{font};
2590
2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594
2595 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2596 my $h = $par->[1]; 2802 my $h = $para->{h};
2597 2803
2598 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] });
2600 $layout->set_width ($W - $par->[3]);
2601 $layout->set_markup ($par->[4]);
2602 2805
2603 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2604 2807
2605 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2606 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 }
2607 } 2822 }
2608 2823
2609 $y += $h; 2824 $y += $h;
2610 } 2825 }
2611
2612 glDisable GL_BLEND;
2613 }; 2826 };
2614 }); 2827 });
2615} 2828}
2616 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2617sub _draw { 2839sub _draw {
2618 my ($self) = @_; 2840 my ($self) = @_;
2619 2841
2620 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2623 $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});
2624 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2625 2847
2626 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2627
2628} 2849}
2629 2850
2630############################################################################# 2851#############################################################################
2631 2852
2632package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2719 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2723 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2724 2948
2725 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2726 markup => $tooltip, 2950 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2739 2963
2740 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2741} 2965}
2742 2966
2743sub size_allocate { 2967sub invoke_size_allocate {
2744 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2745 2969
2746 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2747} 2971}
2748 2972
2749sub visibility_change { 2973sub invoke_visibility_change {
2750 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2751 2975
2752 return unless $visible; 2976 return unless $visible;
2753 2977
2754 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2756 or return; 2980 or return;
2757 2981
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759 2983
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2762 2986
2763 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2764 }); 2988 });
2765} 2989}
2766 2990
… …
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2856 3080
2857 if ($tex) { 3081 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2863 } 3087 }
2864} 3088}
2865 3089
2866sub DESTROY { 3090sub destroy {
2867 my ($self) = @_; 3091 my ($self) = @_;
2868 3092
2869 $self->{timer}->cancel 3093 $self->{timer}->cancel
2870 if $self->{timer}; 3094 if $self->{timer};
2871 3095
2872 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2873} 3097}
2874 3098
2875############################################################################# 3099#############################################################################
2876 3100
2877package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2898 ); 3122 );
2899 3123
2900 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2901 3125
2902 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2903 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2904 3128
2905 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2906 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 {
2907 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2908 can_hover => 1, 3146 can_hover => 1,
2909 can_events => 1, 3147 can_events => 1,
2910 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2911 } 3151 }
2912 3152
2913 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2914 3154
2915 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2920 3160
2921# 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)
2922sub popup { 3162sub popup {
2923 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2924 3164
2925 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2926 3166
2927 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2928 $GRAB = $self; 3168 $GRAB = $self;
2929 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2930 3170
2931 $self->show; 3171 $self->show;
2932 $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);
2933} 3173}
2934 3174
2935sub mouse_motion { 3175sub invoke_mouse_motion {
2936 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2937 3177
2938 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2940 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2941 3181
2942 0 3182 0
2943} 3183}
2944 3184
2945sub button_up { 3185sub invoke_button_up {
2946 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2947 3187
2948 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2949 undef $GRAB; 3189 undef $GRAB;
2950 $self->hide; 3190 $self->hide;
2951 3191
2952 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2953 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2954 } else { 3194 } else {
2955 return 0 3195 return 0
2956 } 3196 }
2957 3197
… …
2984 3224
2985 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} }; 3226 if @{ $self->{children} };
2987} 3227}
2988 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
2989sub set_current_page { 3235sub set_current_page {
2990 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
2991 3237
2992 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
2993 ? $page_or_widget 3239 ? $page_or_widget
2994 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
2995 3241
2996 $self->{current} = $widget; 3242 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998 3244
2999 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
3000 3246
3001 $self->realloc; 3247 $self->realloc;
3002} 3248}
3003 3249
3004sub visible_children { 3250sub visible_children {
… …
3009 my ($self) = @_; 3255 my ($self) = @_;
3010 3256
3011 $self->{current}->size_request 3257 $self->{current}->size_request
3012} 3258}
3013 3259
3014sub size_allocate { 3260sub invoke_size_allocate {
3015 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3016 3262
3017 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3018} 3266}
3019 3267
3020sub _draw { 3268sub _draw {
3021 my ($self) = @_; 3269 my ($self) = @_;
3022 3270
… …
3057 ); 3305 );
3058 3306
3059 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3060} 3308}
3061 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3062sub set_current_page { 3316sub set_current_page {
3063 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3064 3318
3065 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current}); 3320 $self->emit (page_changed => $self->{multiplexer}{current});
3067} 3321}
3068 3322
3069############################################################################# 3323#############################################################################
3070 3324
3071package CFClient::UI::Statusbox; 3325package CFClient::UI::Combobox;
3072 3326
3327use utf8;
3328
3073our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFClient::UI::Button::;
3074 3330
3075sub new { 3331sub new {
3076 my $class = shift; 3332 my $class = shift;
3077 3333
3078 $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 (
3079 fontsize => 0.8, 3389 fontsize => 0.8,
3080 @_, 3390 @_,
3081 ) 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
3082} 3398}
3083 3399
3084sub reorder { 3400sub reorder {
3085 my ($self) = @_; 3401 my ($self) = @_;
3086 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} };
3087 3408
3088 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 3411 }
3091 3412
… …
3094 my @items = sort { 3415 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
3098 3419
3420 $self->{timer}->interval (1);
3421
3099 my $count = 10 + 1; 3422 my $count = 10 + 1;
3100 for my $item (@items) { 3423 for my $item (@items) {
3101 last unless --$count; 3424 last unless --$count;
3102 3425
3103 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 3430 : $item->{text};
3108 3431
… …
3116 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
3122 can_events => 1, 3445 can_events => 1,
3123 can_hover => 1 3446 can_hover => 1
3124 }; 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;
3125 } 3460 }
3126 3461
3127 $self->clear; 3462 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
3129} 3464}
… …
3134 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
3136 3471
3137 return unless $text; 3472 return unless $text;
3138 3473
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 3475
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 3477
3143 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
3145 $item->{count}++; 3480 $item->{count}++;
3146 } else { 3481 } else {
3147 $item->{count} = 1; 3482 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3149 } 3484 }
3150 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3151 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3152 delete $item->{label}; 3487 delete $item->{label};
3153 } else { 3488 } else {
3154 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3155 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3161 count => 1, 3496 count => 1,
3162 %arg, 3497 %arg,
3163 }; 3498 };
3164 } 3499 }
3165 3500
3501 $ROOT->on_refresh (reorder => sub {
3166 $self->reorder; 3502 $self->reorder;
3503 });
3167} 3504}
3168 3505
3169sub reconfigure { 3506sub reconfigure {
3170 my ($self) = @_; 3507 my ($self) = @_;
3171 3508
… …
3174 3511
3175 $self->reorder; 3512 $self->reorder;
3176 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3177} 3514}
3178 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
3179############################################################################# 3524#############################################################################
3180 3525
3181package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3182 3527
3183our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3184 3529
3185sub new { 3530sub new {
3186 my $class = shift; 3531 my $class = shift;
3187 3532
3188 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3190 @_, 3535 @_,
3191 ); 3536 );
3192 3537
3193 $self 3538 $self
3194} 3539}
3195 3540
3196sub set_items { 3541sub set_items {
3197 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3198 3543
3199 $self->{child}->clear; 3544 $self->clear;
3200 return unless $items; 3545 return unless $items;
3201 3546
3202 my @items = sort { 3547 my @items = sort {
3203 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3205 } @$items; 3550 } values %$items;
3206 3551
3207 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3208 3553
3209 my $row = 0; 3554 my $row = 0;
3210 for my $item (@items) { 3555 for my $item (@items) {
3211 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3212 3557
3213 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3216 3561
3217 $row++; 3562 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 } 3563 }
3416} 3564}
3417 3565
3418############################################################################# 3566#############################################################################
3419 3567
… …
3429 commands => [], 3577 commands => [],
3430 @_, 3578 @_,
3431 ) 3579 )
3432} 3580}
3433 3581
3434# 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
3435sub add_spell { 3667sub add_spell {
3436 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3437 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3438 3671 $self->rebuild_spell_list;
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466} 3672}
3467 3673
3468sub remove_spell { 3674sub remove_spell {
3469 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3470 delete $self->{spells}->{$spell->{name}}; 3677 delete $self->{spell}->{$spell->{name}};
3471 $self->rebuild_spell_list; 3678 $self->rebuild_spell_list;
3472} 3679}
3473 3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3474############################################################################# 3688#############################################################################
3475 3689
3476package CFClient::UI::Root; 3690package CFClient::UI::Root;
3477 3691
3478our @ISA = CFClient::UI::Container::; 3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3479 3695
3480use CFClient::OpenGL; 3696use CFClient::OpenGL;
3481 3697
3482sub new { 3698sub new {
3483 my $class = shift; 3699 my $class = shift;
… …
3510 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3511 3727
3512 int $coord + 0.5 3728 int $coord + 0.5
3513} 3729}
3514 3730
3515sub size_allocate { 3731sub invoke_size_allocate {
3516 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3517 3733
3518 for my $child ($self->children) { 3734 for my $child ($self->children) {
3519 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)};
3520 3736
… …
3524 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3526 3742
3527 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3528 } 3744 }
3745
3746 1
3529} 3747}
3530 3748
3531sub coord2local { 3749sub coord2local {
3532 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3533 3751
… …
3618 3836
3619 delete $queue{$widget+0}; 3837 delete $queue{$widget+0};
3620 3838
3621 my ($w, $h) = $widget->size_request; 3839 my ($w, $h) = $widget->size_request;
3622 3840
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $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};
3625 3846
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 3847 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 3848 $h = $widget->{force_h} if exists $widget->{force_h};
3628 3849
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3655 3876
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3657 3878
3658 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3659 $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};
3660 3887
3661 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3662 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3663 3890
3664 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