ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.337 by root, Mon Jul 24 04:24:43 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
… …
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";
338} 360}
339 361
362sub baseline_shift {
363 0
364}
365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
343 if ($self->{aspect}) { 369 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
345 371
346 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
348 374
349 # use alignment to adjust x, y 375 # use alignment to adjust x, y
350 376
351 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
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 {
408 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
409 433
434 Carp::confess unless $self->{parent};#d#
435
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 437}
412 438
413# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
414sub coord2global { 440sub coord2global {
415 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
416 442
443 Carp::confess unless $self->{parent};#d#
444
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 446}
419 447
420sub focus_in { 448sub invoke_focus_in {
421 my ($self) = @_; 449 my ($self) = @_;
422 450
423 return if $FOCUS == $self; 451 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
425 453
426 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
427 455
428 $self->_emit (focus_in => $focus); 456 $self->update;
429 457
430 $focus->update if $focus; 458 0
431 $FOCUS->update;
432} 459}
433 460
434sub focus_out { 461sub invoke_focus_out {
435 my ($self) = @_; 462 my ($self) = @_;
436 463
437 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
438 465
439 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
440 467
441 $self->_emit (focus_out => $focus); 468 $self->update;
442 469
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 471 unless $FOCUS;
447}
448 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
449sub mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 484sub invoke_button_up { 0 }
451sub key_down { 0 } 485sub invoke_key_down { 0 }
452sub key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
453 488
454sub button_down { 489sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
456 491
457 $self->focus_in; 492 $self->grab_focus;
458 493
459 0 494 0
495}
496
497sub connect {
498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 531}
461 532
462sub find_widget { 533sub find_widget {
463 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
464 535
… …
474sub set_parent { 545sub set_parent {
475 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
476 547
477 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 549 $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} 550}
503 551
504sub realloc { 552sub realloc {
505 my ($self) = @_; 553 my ($self) = @_;
506 554
… …
539 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
540 588
541 # update screen rectangle 589 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 592
547 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 596
551 glPushMatrix; 597 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 599
556 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 602 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 604 glBegin GL_QUADS;
563 glVertex $x , $y; 605 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
567 glEnd; 609 glEnd;
568 glDisable GL_BLEND; 610 glDisable GL_BLEND;
569 } 611 }
570 612
571 if ($ENV{CFPLUS_DEBUG} & 1) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 614 glPushMatrix;
573 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 618 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
580 glEnd; 622 glEnd;
581 glPopMatrix; 623 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
584} 629}
585 630
586sub _draw { 631sub _draw {
587 my ($self) = @_; 632 my ($self) = @_;
588 633
… …
590} 635}
591 636
592sub DESTROY { 637sub DESTROY {
593 my ($self) = @_; 638 my ($self) = @_;
594 639
640 return if CFClient::in_destruct;
641
595 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
596 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 646}
598 647
599############################################################################# 648#############################################################################
600 649
601package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
626 675
627 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
629 678
630 glEnable GL_BLEND; 679 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 681 glColor_premultiply @$color;
633 682
634 glBegin GL_QUADS; 683 glBegin GL_QUADS;
635 glVertex 0 , 0; 684 glVertex 0 , 0;
636 glVertex 0 , $h; 685 glVertex 0 , $h;
637 glVertex $w, $h; 686 glVertex $w, $h;
… …
682 if $children; 731 if $children;
683 732
684 $self 733 $self
685} 734}
686 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
687sub add { 744sub add {
688 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
689 746
690 $_->set_parent ($self) 747 $_->set_parent ($self)
691 for @widgets; 748 for @widgets;
… …
766} 823}
767 824
768sub add { 825sub add {
769 my ($self, $child) = @_; 826 my ($self, $child) = @_;
770 827
771 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
774} 830}
775 831
776sub remove { 832sub remove {
777 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
786 842
787sub size_request { 843sub size_request {
788 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
789} 845}
790 846
791sub size_allocate { 847sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
793 849
794 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
795} 853}
796 854
797############################################################################# 855#############################################################################
798 856
799# back-buffered drawing area 857# back-buffered drawing area
… …
815 873
816 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
817 $self->SUPER::update; 875 $self->SUPER::update;
818} 876}
819 877
820sub size_allocate { 878sub invoke_size_allocate {
821 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
822 880
823 $self->SUPER::size_allocate ($w, $h);
824 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
825} 884}
826 885
827sub _render { 886sub _render {
828 my ($self) = @_; 887 my ($self) = @_;
829 888
… …
856 my $tex = $self->{texture} 915 my $tex = $self->{texture}
857 or return; 916 or return;
858 917
859 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
862 921
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 923
865 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
866} 925}
… …
890 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
891 950
892 ($w, $h) 951 ($w, $h)
893} 952}
894 953
895sub size_allocate { 954sub invoke_size_allocate {
896 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
897 956
898 my $child = $self->child; 957 my $child = $self->child;
899 958
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902 961
903 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
904 $self->update; 963 $self->update;
964
965 1
905} 966}
906 967
907sub set_offset { 968sub set_offset {
908 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
909 970
… …
972 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
973 }, 1034 },
974 ; 1035 ;
975 1036
976 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
978 slider => $slider, 1040 slider => $slider,
979 %arg, 1041 %arg,
980 ); 1042 );
981 1043
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
984 1046
985 $self 1047 $self
986} 1048}
987 1049
1050#TODO# update range on size_allocate depending on child
1051
988sub add { 1052sub add {
989 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
990 1054
991 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
992} 1056}
993 1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
994sub update { 1074sub update {
995 my ($self) = @_; 1075 my ($self) = @_;
996 1076
997 $self->SUPER::update; 1077 $self->SUPER::update;
998 1078
999 # todo: overwrite size_allocate of child 1079 $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} 1080}
1003 1081
1004sub size_allocate { 1082sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1006 1084
1085 $self->update_slider;
1086
1007 $self->SUPER::size_allocate ($w, $h); 1087 $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} 1088}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1089
1016############################################################################# 1090#############################################################################
1017 1091
1018package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1019 1093
… …
1035 1109
1036 if ($self->{bg}) { 1110 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
1038 1112
1039 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
1042 1116
1043 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1118 glVertex 0 , 0;
1045 glVertex 0 , $h; 1119 glVertex 0 , $h;
1046 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1145
1072sub new { 1146sub new {
1073 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1074 1148
1075 my $title = delete $arg{title};
1076
1077 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1080 border => 0.6, 1152 border => 0.6,
1081 can_events => 1, 1153 can_events => 1,
1082 min_w => 16, 1154 min_w => 64,
1083 min_h => 16, 1155 min_h => 32,
1084 %arg, 1156 %arg,
1085 ); 1157 );
1086 1158
1087 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1088 align => 0, 1160 align => 0,
1089 valign => 1, 1161 valign => 1,
1090 text => $title, 1162 text => $self->{title},
1091 fontsize => $self->{border} 1163 fontsize => $self->{border},
1092 if defined $title; 1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFClient::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFClient::UI::Container::add ($self->{close_button});
1173 }
1093 1174
1094 $self 1175 $self
1095} 1176}
1096 1177
1097sub add { 1178sub add {
1098 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1099 1180
1100 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102} 1184}
1103 1185
1104sub border { 1186sub border {
1105 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1106} 1188}
1107 1189
1108sub size_request { 1190sub size_request {
1109 my ($self) = @_; 1191 my ($self) = @_;
1110 1192
1111 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1112 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1113 1198
1114 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1115 1200
1116 ( 1201 (
1117 $w + $self->border * 2, 1202 $w + $self->border * 2,
1118 $h + $self->border * 2, 1203 $h + $self->border * 2,
1119 ) 1204 )
1120} 1205}
1121 1206
1122sub size_allocate { 1207sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1124 1209
1125 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1126 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1127 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1129 } 1214 }
1130 1215
1131 my $border = $self->border; 1216 my $border = $self->border;
1132 1217
1133 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1134 $w -= List::Util::max 0, $border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1220
1221 $self->child->configure ($border, $border, $w, $h);
1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1135 1233
1136 $self->child->configure ($border, $border, $w, $h); 1234 1
1137} 1235}
1138 1236
1139sub button_down { 1237sub invoke_button_down {
1140 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1141 1239
1142 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1143 my $border = $self->border; 1241 my $border = $self->border;
1144 1242
… …
1160 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1161 1259
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1264 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1265 };
1168 1266
1169 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1175 1273
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1275
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1277 # HACK: the next line is required to enforce placement
1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1279 };
1180 } else { 1280 } else {
1181 return 0; 1281 return 0;
1182 } 1282 }
1183 1283
1184 1 1284 1
1185} 1285}
1186 1286
1187sub button_up { 1287sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1189 1289
1190 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1191} 1291}
1192 1292
1193sub mouse_motion { 1293sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1195 1295
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1297
1198 !!$self->{motion} 1298 ! ! $self->{motion}
1199} 1299}
1200 1300
1201sub _draw { 1301sub _draw {
1202 my ($self) = @_; 1302 my ($self) = @_;
1203 1303
… …
1229 1329
1230 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1231 1331
1232 $child->draw; 1332 $child->draw;
1233 1333
1234 if ($self->{title}) { 1334 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1335 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1237 } 1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1238} 1343}
1239 1344
1240############################################################################# 1345#############################################################################
1241 1346
1242package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1259sub children { 1364sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1261} 1366}
1262 1367
1263sub add { 1368sub add {
1264 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1265 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1266 $child->set_parent ($self); 1373 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1268 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1269 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1270} 1386}
1271 1387
1272# TODO: move to container class maybe? send children a signal on removal? 1388# TODO: move to container class maybe? send children a signal on removal?
1273sub clear { 1389sub clear {
1274 my ($self) = @_; 1390 my ($self) = @_;
… …
1315 (sum @$ws), 1431 (sum @$ws),
1316 (sum @$hs), 1432 (sum @$hs),
1317 ) 1433 )
1318} 1434}
1319 1435
1320sub size_allocate { 1436sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1322 1438
1323 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1324 1440
1325 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1357 } 1473 }
1358 1474
1359 $y += $row_h; 1475 $y += $row_h;
1360 } 1476 }
1361 1477
1478 1
1362} 1479}
1363 1480
1364sub find_widget { 1481sub find_widget {
1365 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1366 1483
… …
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 ) 1522 )
1406} 1523}
1407 1524
1408sub size_allocate { 1525sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1410 1527
1411 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1413 1530
1414 my @req; 1531 my @req;
1415 1532
1416 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1418 } else { 1535 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1421 1538
1422 if ($req > $space) { 1539 if ($req > $space) {
1423 # ah well, not enough space 1540 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1425 } else { 1542 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1544
1428 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1429 1546
1430 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1548 for 0 .. $#children;
1432 } 1549 }
1433 } 1550 }
1434 1551
1435 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1436 1553
1437 my $pos = 0; 1554 my $pos = 0;
1438 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1441 1558
1442 $pos += $alloc; 1559 $pos += $alloc;
1443 } 1560 }
1444 1561
1445 1 1562 1
… …
1518 } 1635 }
1519 1636
1520 $self 1637 $self
1521} 1638}
1522 1639
1523sub escape($) {
1524 local $_ = $_[0];
1525
1526 s/&/&amp;/g;
1527 s/>/&gt;/g;
1528 s/</&lt;/g;
1529
1530 $_
1531}
1532
1533sub update { 1640sub update {
1534 my ($self) = @_; 1641 my ($self) = @_;
1535 1642
1536 delete $self->{texture}; 1643 delete $self->{texture};
1537 $self->SUPER::update; 1644 $self->SUPER::update;
1538} 1645}
1539 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1540sub set_text { 1654sub set_text {
1541 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1542 1656
1543 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1545 1659
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1548 1661
1662 delete $self->{size_req};
1549 $self->realloc; 1663 $self->realloc;
1550 $self->update; 1664 $self->update;
1551} 1665}
1552 1666
1553sub set_markup { 1667sub set_markup {
… …
1556 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1558 1672
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1674
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1563 1676
1677 delete $self->{size_req};
1564 $self->realloc; 1678 $self->realloc;
1565 $self->update; 1679 $self->update;
1566} 1680}
1567 1681
1568sub size_request { 1682sub size_request {
1569 my ($self) = @_; 1683 my ($self) = @_;
1570 1684
1685 $self->{size_req} ||= do {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1691
1577 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1578 1693
1579 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1580 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1698
1583 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1584 1700
1585 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1587 } 1706 };
1588 1707
1589 ($w, $h) 1708 @{ $self->{size_req} }
1590} 1709}
1591 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1592sub size_allocate { 1715sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1594 1717
1595 delete $self->{ox}; 1718 delete $self->{ox};
1596 1719
1597 delete $self->{texture} 1720 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1599} 1724}
1600 1725
1601sub set_fontsize { 1726sub set_fontsize {
1602 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1603 1728
1604 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1605 delete $self->{texture}; 1731 delete $self->{texture};
1606 1732
1607 $self->realloc; 1733 $self->realloc;
1608} 1734}
1609 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1610sub _draw { 1745sub _draw {
1611 my ($self) = @_; 1746 my ($self) = @_;
1612 1747
1613 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1614 1749
1615 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1617 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1618 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1757
1623 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1624 }; 1759 };
1625 1760
1626 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1630 1765
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1634 }; 1769 };
1635 1770
1636 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1638 1773
1639 if ($tex->{format} == GL_ALPHA) { 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1640 glColor @{$self->{fg}};
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645
1646 glDisable GL_TEXTURE_2D;
1647} 1775}
1648 1776
1649############################################################################# 1777#############################################################################
1650 1778
1651package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1665 can_hover => 1, 1793 can_hover => 1,
1666 can_focus => 1, 1794 can_focus => 1,
1667 valign => 0, 1795 valign => 0,
1668 can_events => 1, 1796 can_events => 1,
1669 #text => ... 1797 #text => ...
1798 #hidden => "*",
1670 @_ 1799 @_
1671 ) 1800 )
1672} 1801}
1673 1802
1674sub _set_text { 1803sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1811 $self->{text} = $text;
1683 1812
1684 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1686 1816
1687 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1688 $self->update; 1820 $self->update;
1689} 1821}
1690 1822
1691sub set_text { 1823sub set_text {
1692 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1693 1825
1694 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1827 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1828}
1699 1829
1700sub get_text { 1830sub get_text {
1701 $_[0]{text} 1831 $_[0]{text}
1702} 1832}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1708 1838
1709 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1710} 1840}
1711 1841
1712sub key_down { 1842sub invoke_key_down {
1713 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1714 1844
1715 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1729 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1730 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 1864 $self->emit ('escape');
1735 } elsif ($uni) { 1865 } elsif ($uni) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 1867 } else {
1738 return 0; 1868 return 0;
1739 } 1869 }
… …
1743 $self->realloc; 1873 $self->realloc;
1744 1874
1745 1 1875 1
1746} 1876}
1747 1877
1748sub focus_in { 1878sub invoke_focus_in {
1749 my ($self) = @_; 1879 my ($self) = @_;
1750 1880
1751 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1752 1882
1753 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1754} 1884}
1755 1885
1756sub button_down { 1886sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1758 1888
1759 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 1890
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 1892
1763 # byte-index to char-index 1893 # byte-index to char-index
1764 my $text = $self->{text}; 1894 my $text = $self->{text};
1765 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1767 1897
1768 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1769 $self->update; 1899 $self->update;
1770 1900
1771 1 1901 1
1772} 1902}
1773 1903
1774sub mouse_motion { 1904sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1776# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1906# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1777 1907
1778 0 1908 1
1779} 1909}
1780 1910
1781sub _draw { 1911sub _draw {
1782 my ($self) = @_; 1912 my ($self) = @_;
1783 1913
1784 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1785 1915
1786 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1789 } else { 1919 } else {
1790 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1791 } 1921 }
1792 1922
1793 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1796 glVertex 0 , 0; 1926 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1824 1954
1825our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1826 1956
1827use CFClient::OpenGL; 1957use CFClient::OpenGL;
1828 1958
1829sub key_down { 1959sub invoke_key_down {
1830 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1831 1961
1832 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1833 1963
1834 if ($sym == 13) { 1964 if ($sym == 13) {
1835 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1837 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1840 $self->update; 1971 $self->update;
1841 1972
1842 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1860 } else { 1991 } else {
1861 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1862 } 1993 }
1863 1994
1864 } else { 1995 } else {
1865 return $self->SUPER::key_down ($ev) 1996 return $self->SUPER::invoke_key_down ($ev)
1866 } 1997 }
1867 1998
1868 1 1999 1
1869} 2000}
1870 2001
… …
1894 can_events => 1, 2025 can_events => 1,
1895 @_ 2026 @_
1896 ) 2027 )
1897} 2028}
1898 2029
1899sub activate { }
1900
1901sub button_up { 2030sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1903 2032
1904 $self->emit ("activate") 2033 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
… …
1909} 2038}
1910 2039
1911sub _draw { 2040sub _draw {
1912 my ($self) = @_; 2041 my ($self) = @_;
1913 2042
1914 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 2044
1920 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1923 2048
… …
1960 my ($self) = @_; 2085 my ($self) = @_;
1961 2086
1962 (6) x 2 2087 (6) x 2
1963} 2088}
1964 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1965sub button_down { 2098sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1967 2100
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2103 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2104 } else {
1973 return 0 2105 return 0
1974 } 2106 }
1975 2107
1976 1 2108 1
… …
2001package CFClient::UI::Image; 2133package CFClient::UI::Image;
2002 2134
2003our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
2004 2136
2005use CFClient::OpenGL; 2137use CFClient::OpenGL;
2006use Carp qw/confess/;
2007 2138
2008our %loaded_images; 2139our %texture_cache;
2009 2140
2010sub new { 2141sub new {
2011 my $class = shift; 2142 my $class = shift;
2012 2143
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
2014 2148
2015 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2149 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required";
2016 2151
2017 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2019 2154
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
2021 2156
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2158
2026 $self 2159 $self
2027} 2160}
2028 2161
2162sub STORABLE_freeze {
2163 my ($self, $cloning) = @_;
2164
2165 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2167
2168 $self->{path}
2169}
2170
2171sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_;
2173
2174 $self->new (path => $path)
2175}
2176
2029sub size_request { 2177sub size_request {
2030 my ($self) = @_; 2178 my ($self) = @_;
2031 2179
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2033} 2181}
2034 2182
2035sub _draw { 2183sub _draw {
2036 my ($self) = @_; 2184 my ($self) = @_;
2037 2185
… …
2047 } 2195 }
2048 2196
2049 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2199
2052 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
2053 2201
2054 glDisable GL_TEXTURE_2D; 2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::ImageButton;
2208
2209our @ISA = CFClient::UI::Image::;
2210
2211use CFClient::OpenGL;
2212
2213my %textures;
2214
2215sub new {
2216 my $class = shift;
2217
2218 my $self = $class->SUPER::new (
2219 padding_x => 4,
2220 padding_y => 4,
2221 fg => [1, 1, 1],
2222 active_fg => [0, 0, 1],
2223 can_hover => 1,
2224 align => 0,
2225 valign => 0,
2226 can_events => 1,
2227 @_
2228 );
2229}
2230
2231sub invoke_button_up {
2232 my ($self, $ev, $x, $y) = @_;
2233
2234 $self->emit ("activate")
2235 if $x >= 0 && $x < $self->{w}
2236 && $y >= 0 && $y < $self->{h};
2237
2238 1
2055} 2239}
2056 2240
2057############################################################################# 2241#############################################################################
2058 2242
2059package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2332
2149 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
2150 my $h2 = $self->{h} * (1 - $ycut2); 2334 my $h2 = $self->{h} * (1 - $ycut2);
2335 my $h3 = $self->{h};
2336
2337 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2151 2338
2152 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
2153 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2340 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2341 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2344
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2345 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2346 glBegin GL_QUADS;
… …
2173 2361
2174 if ($t3) { 2362 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2369 glEnd;
2182 } 2370 }
2183 2371
2184 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2272 $self->update; 2460 $self->update;
2273 2461
2274 $self 2462 $self
2275} 2463}
2276 2464
2277sub changed { }
2278
2279sub set_range { 2465sub set_range {
2280 my ($self, $range) = @_; 2466 my ($self, $range) = @_;
2281 2467
2282 ($range, $self->{range}) = ($self->{range}, $range); 2468 ($range, $self->{range}) = ($self->{range}, $range);
2283 2469
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 2470 if ("@$range" ne "@{$self->{range}}") {
2471 $self->update;
2472 $self->set_value ($self->{range}[0]);
2473 }
2286} 2474}
2287 2475
2288sub set_value { 2476sub set_value {
2289 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2290 2478
… …
2301 if $unit; 2489 if $unit;
2302 2490
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 2492
2305 if ($value != $old_value) { 2493 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 2494 $self->emit (changed => $value);
2307 $self->update; 2495 $self->update;
2308 } 2496 }
2309} 2497}
2310 2498
2311sub size_request { 2499sub size_request {
2312 my ($self) = @_; 2500 my ($self) = @_;
2313 2501
2314 ($self->{req_w}, $self->{req_h}) 2502 ($self->{req_w}, $self->{req_h})
2315} 2503}
2316 2504
2317sub button_down { 2505sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2319 2507
2320 $self->SUPER::button_down ($ev, $x, $y); 2508 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 2509
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 2511
2324 $self->mouse_motion ($ev, $x, $y) 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2325} 2513}
2326 2514
2327sub mouse_motion { 2515sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2329 2517
2330 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 2520
… …
2338 } else { 2526 } else {
2339 return 0; 2527 return 0;
2340 } 2528 }
2341 2529
2342 1 2530 1
2531}
2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2343} 2541}
2344 2542
2345sub update { 2543sub update {
2346 my ($self) = @_; 2544 my ($self) = @_;
2347 2545
… …
2437sub set_range { shift->{slider}->set_range (@_) } 2635sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 2636sub set_value { shift->{slider}->set_value (@_) }
2439 2637
2440############################################################################# 2638#############################################################################
2441 2639
2442package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2443 2641
2444our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2445 2643
2446use CFClient::OpenGL; 2644use CFClient::OpenGL;
2447 2645
2448sub new { 2646sub new {
2449 my $class = shift; 2647 my $class = shift;
2450 2648
2451 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2452 fontsize => 1, 2650 fontsize => 1,
2453 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2454 #font => default_font 2653 #font => default_font
2455 @_, 2654 @_,
2456 2655
2457 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2458 par => [], 2657 par => [],
2459 height => 0, 2658 height => 0,
2460 children => [ 2659 children => [
2461 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2473 2672
2474 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2475 $self->reflow; 2674 $self->reflow;
2476} 2675}
2477 2676
2677sub size_request {
2678 my ($self) = @_;
2679
2680 my ($empty, $slider) = @{ $self->{children} };
2681
2682 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request
2684}
2685
2478sub size_allocate { 2686sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 2687 my ($self, $w, $h) = @_;
2480 2688
2481 $self->SUPER::size_allocate ($w, $h); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 2691
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $self->{layout}->set_width ($self->{children}[0]{w}); 2694 $self->{layout}->set_width ($empty->{w});
2695 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2486 2696
2487 $self->reflow; 2697 $self->reflow;
2488}
2489 2698
2490sub text_size { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2491 my ($self, $text, $indent) = @_; 2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2711}
2712
2713sub get_layout {
2714 my ($self, $para) = @_;
2492 2715
2493 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2494 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent); 2721 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2722 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2497 $layout->set_markup ($text); 2723 $layout->set_markup ($para->{markup});
2724
2725 $layout->set_shapes (
2726 map
2727 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2728 @{$para->{widget}}
2498 2729 );
2730
2499 $layout->size 2731 $layout
2500} 2732}
2501 2733
2502sub reflow { 2734sub reflow {
2503 my ($self) = @_; 2735 my ($self) = @_;
2504 2736
… …
2513 $self->{children}[1]->set_value ($offset); 2745 $self->{children}[1]->set_value ($offset);
2514} 2746}
2515 2747
2516sub clear { 2748sub clear {
2517 my ($self) = @_; 2749 my ($self) = @_;
2750
2751 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other;
2518 2753
2519 $self->{par} = []; 2754 $self->{par} = [];
2520 $self->{height} = 0; 2755 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 2757}
2523 2758
2524sub add_paragraph { 2759sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 2760 my ($self, $color, $para, $indent) = @_;
2526 2761
2527 for my $line (split /\n/, $text) { 2762 my ($text, @w) = ref $para ? @$para : $para;
2528 my ($w, $h) = $self->text_size ($line); 2763
2529 $self->{height} += $h; 2764 $para = {
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2765 w => 1e10,
2766 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2531 } 2771 };
2532 2772
2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2773 $self->add (@w) if @w;
2774 push @{$self->{par}}, $para;
2775
2776 $self->{need_reflow}++;
2777 $self->update;
2778}
2779
2780sub scroll_to_bottom {
2781 my ($self) = @_;
2782
2783 $self->{scroll_to_bottom} = 1;
2784 $self->update;
2534} 2785}
2535 2786
2536sub update { 2787sub update {
2537 my ($self) = @_; 2788 my ($self) = @_;
2538 2789
… …
2540 2791
2541 return unless $self->{h} > 0; 2792 return unless $self->{h} > 0;
2542 2793
2543 delete $self->{texture}; 2794 delete $self->{texture};
2544 2795
2545 $ROOT->on_post_alloc ($self, sub { 2796 $ROOT->on_post_alloc ($self => sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 2798
2548 if (delete $self->{need_reflow}) { 2799 if (delete $self->{need_reflow}) {
2549 my $height = 0; 2800 my $height = 0;
2550 2801
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) { 2802 for my $para (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2557 $layout->set_width ($W - $_->[3]); 2804 my $layout = $self->get_layout ($para);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size; 2805 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3]; 2806
2561 $_->[1] = $h; 2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2562 } 2810 }
2563 2811
2564 $height += $_->[1]; 2812 $height += $para->{h};
2565 } 2813 }
2566 2814
2567 $self->{height} = $height; 2815 $self->{height} = $height;
2568 2816
2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2570 2818
2571 delete $self->{texture}; 2819 delete $self->{texture};
2572 } 2820 }
2573 2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 2827 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 2828 glClear GL_COLOR_BUFFER_BIT;
2577 2829
2578 my $top = int $self->{children}[1]{range}[0]; 2830 my $top = int $self->{children}[1]{range}[0];
2579 2831
2580 my $y0 = $top; 2832 my $y0 = $top;
2581 my $y1 = $top + $H; 2833 my $y1 = $top + $H;
2582 2834
2583 my $y = 0; 2835 my $y = 0;
2584 2836
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2593 for my $par (@{$self->{par}}) { 2837 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 2838 my $h = $para->{h};
2595 2839
2596 if ($y0 < $y + $h && $y < $y1) { 2840 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] });
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 2841
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2842 my $layout = $self->get_layout ($para);
2602 2843
2603 glRasterPos $par->[3], $y - $y0; 2844 $layout->render ($para->{indent}, $y - $y0);
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2845
2846 if (my @w = @{ $para->{widget} }) {
2847 my @s = $layout->get_shapes;
2848
2849 for (@w) {
2850 my ($dx, $dy) = splice @s, 0, 2, ();
2851
2852 $_->{x} = $dx + $para->{indent};
2853 $_->{y} = $dy + $y - $y0;
2854
2855 $_->draw;
2856 }
2857 }
2605 } 2858 }
2606 2859
2607 $y += $h; 2860 $y += $h;
2608 } 2861 }
2609
2610 glDisable GL_BLEND;
2611 }; 2862 };
2612 }); 2863 });
2613} 2864}
2614 2865
2866sub reconfigure {
2867 my ($self) = @_;
2868
2869 $self->SUPER::reconfigure;
2870
2871 $_->{w} = 1e10 for @{ $self->{par} };
2872 $self->reflow;
2873}
2874
2615sub _draw { 2875sub _draw {
2616 my ($self) = @_; 2876 my ($self) = @_;
2617 2877
2618 glEnable GL_TEXTURE_2D; 2878 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 2880 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2881 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 2882 glDisable GL_TEXTURE_2D;
2623 2883
2624 $self->{children}[1]->draw; 2884 $self->{children}[1]->draw;
2625
2626} 2885}
2627 2886
2628############################################################################# 2887#############################################################################
2629 2888
2630package CFClient::UI::Animator; 2889package CFClient::UI::Animator;
… …
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 2976 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2977 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 2978 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 2979 . "visible $widget->{visible}";
2721 } 2980 }
2981
2982 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//;
2722 2984
2723 $self->add (new CFClient::UI::Label 2985 $self->add (new CFClient::UI::Label
2724 markup => $tooltip, 2986 markup => $tooltip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 2988 fontsize => 0.8,
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2998 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 2999
2738 ($w + 4, $h + 4) 3000 ($w + 4, $h + 4)
2739} 3001}
2740 3002
2741sub size_allocate { 3003sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 3004 my ($self, $w, $h) = @_;
2743 3005
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 3006 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 3007}
2746 3008
2747sub visibility_change { 3009sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 3010 my ($self, $visible) = @_;
2749 3011
2750 return unless $visible; 3012 return unless $visible;
2751 3013
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 3014 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner} 3015 my $widget = $self->{owner}
2754 or return; 3016 or return;
2755 3017
3018 if ($widget->{visible}) {
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3019 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 3020
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3021 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 3022 if $x + $self->{w} > $self->{root}{w};
2760 3023
2761 $self->move_abs ($x, $y); 3024 $self->move_abs ($x, $y);
3025 } else {
3026 $self->hide;
3027 }
2762 }); 3028 });
2763} 3029}
2764 3030
2765sub _draw { 3031sub _draw {
2766 my ($self) = @_; 3032 my ($self) = @_;
… …
2792 3058
2793############################################################################# 3059#############################################################################
2794 3060
2795package CFClient::UI::Face; 3061package CFClient::UI::Face;
2796 3062
2797our @ISA = CFClient::UI::Base::; 3063our @ISA = CFClient::UI::DrawBG::;
2798 3064
2799use CFClient::OpenGL; 3065use CFClient::OpenGL;
2800 3066
2801sub new { 3067sub new {
2802 my $class = shift; 3068 my $class = shift;
… …
2839sub _draw { 3105sub _draw {
2840 my ($self) = @_; 3106 my ($self) = @_;
2841 3107
2842 return unless $::CONN; 3108 return unless $::CONN;
2843 3109
3110 $self->SUPER::_draw;
3111
2844 my $face; 3112 my $face;
2845 3113
2846 if ($self->{frame}) { 3114 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}]; 3115 my $anim = $::CONN->{anim}[$self->{anim}];
2848 3116
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3121 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 3122
2855 if ($tex) { 3123 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3124 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3126 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3127 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3128 glDisable GL_TEXTURE_2D;
2861 } 3129 }
2862} 3130}
2863 3131
2864sub DESTROY { 3132sub destroy {
2865 my ($self) = @_; 3133 my ($self) = @_;
2866 3134
2867 $self->{timer}->cancel 3135 $self->{timer}->cancel
2868 if $self->{timer}; 3136 if $self->{timer};
2869 3137
2870 $self->SUPER::DESTROY; 3138 $self->SUPER::destroy;
2871} 3139}
2872 3140
2873############################################################################# 3141#############################################################################
2874 3142
2875package CFClient::UI::Buttonbar; 3143package CFClient::UI::Buttonbar;
… …
2896 ); 3164 );
2897 3165
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3166 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2899 3167
2900 for my $item (@{ $self->{items} }) { 3168 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3169 my ($widget, $cb, $tooltip) = @$item;
2902 3170
2903 # handle various types of items, only text for now 3171 # handle various types of items, only text for now
2904 if (!ref $widget) { 3172 if (!ref $widget) {
3173 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2;
3175
3176 $widget = new CFClient::UI::HBox
3177 can_hover => 1,
3178 can_events => 1,
3179 tooltip => $tooltip,
3180 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1),
3183 ],
3184 ;
3185
3186 } else {
2905 $widget = new CFClient::UI::Label 3187 $widget = new CFClient::UI::Label
2906 can_hover => 1, 3188 can_hover => 1,
2907 can_events => 1, 3189 can_events => 1,
2908 text => $widget; 3190 markup => $widget,
3191 tooltip => $tooltip;
3192 }
2909 } 3193 }
2910 3194
2911 $self->{item}{$widget} = $item; 3195 $self->{item}{$widget} = $item;
2912 3196
2913 $self->{vbox}->add ($widget); 3197 $self->{vbox}->add ($widget);
… …
2918 3202
2919# popup given the event (must be a mouse button down event currently) 3203# popup given the event (must be a mouse button down event currently)
2920sub popup { 3204sub popup {
2921 my ($self, $ev) = @_; 3205 my ($self, $ev) = @_;
2922 3206
2923 $self->_emit ("popdown"); 3207 $self->emit ("popdown");
2924 3208
2925 # maybe save $GRAB? must be careful about events... 3209 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3210 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3211 $self->{button} = $ev->{button};
2928 3212
2929 $self->show; 3213 $self->show;
2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3214 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2931} 3215}
2932 3216
2933sub mouse_motion { 3217sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3218 my ($self, $ev, $x, $y) = @_;
2935 3219
2936 # TODO: should use vbox->find_widget or so 3220 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3221 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3222 $self->{hover} = $self->{item}{$HOVER};
2939 3223
2940 0 3224 0
2941} 3225}
2942 3226
2943sub button_up { 3227sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3228 my ($self, $ev, $x, $y) = @_;
2945 3229
2946 if ($ev->{button} == $self->{button}) { 3230 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3231 undef $GRAB;
2948 $self->hide; 3232 $self->hide;
2949 3233
2950 $self->_emit ("popdown"); 3234 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3235 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3236 } else {
2953 return 0 3237 return 0
2954 } 3238 }
2955 3239
… …
2982 3266
2983 $self->{current} = $self->{children}[0] 3267 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3268 if @{ $self->{children} };
2985} 3269}
2986 3270
3271sub get_current_page {
3272 my ($self) = @_;
3273
3274 $self->{current}
3275}
3276
2987sub set_current_page { 3277sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3278 my ($self, $page_or_widget) = @_;
2989 3279
2990 my $widget = ref $page_or_widget 3280 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3281 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3282 : $self->{children}[$page_or_widget];
2993 3283
2994 $self->{current} = $widget; 3284 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3285 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3286
2997 $self->_emit (page_changed => $self->{current}); 3287 $self->emit (page_changed => $self->{current});
2998 3288
2999 $self->realloc; 3289 $self->realloc;
3000} 3290}
3001 3291
3002sub visible_children { 3292sub visible_children {
… …
3007 my ($self) = @_; 3297 my ($self) = @_;
3008 3298
3009 $self->{current}->size_request 3299 $self->{current}->size_request
3010} 3300}
3011 3301
3012sub size_allocate { 3302sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3303 my ($self, $w, $h) = @_;
3014 3304
3015 $self->{current}->configure (0, 0, $w, $h); 3305 $self->{current}->configure (0, 0, $w, $h);
3306
3307 1
3016} 3308}
3017 3309
3018sub _draw { 3310sub _draw {
3019 my ($self) = @_; 3311 my ($self) = @_;
3020 3312
… …
3055 ); 3347 );
3056 3348
3057 $self->{multiplexer}->add ($widget); 3349 $self->{multiplexer}->add ($widget);
3058} 3350}
3059 3351
3352sub get_current_page {
3353 my ($self) = @_;
3354
3355 $self->{multiplexer}->get_current_page
3356}
3357
3060sub set_current_page { 3358sub set_current_page {
3061 my ($self, $page) = @_; 3359 my ($self, $page) = @_;
3062 3360
3063 $self->{multiplexer}->set_current_page ($page); 3361 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 3362 $self->emit (page_changed => $self->{multiplexer}{current});
3065} 3363}
3066 3364
3067############################################################################# 3365#############################################################################
3068 3366
3069package CFClient::UI::Statusbox; 3367package CFClient::UI::Selector;
3070 3368
3369use utf8;
3370
3071our @ISA = CFClient::UI::VBox::; 3371our @ISA = CFClient::UI::Button::;
3072 3372
3073sub new { 3373sub new {
3074 my $class = shift; 3374 my $class = shift;
3075 3375
3076 $class->SUPER::new ( 3376 my $self = $class->SUPER::new (
3377 options => [], # [value, title, longdesc], ...
3378 value => undef,
3379 @_,
3380 );
3381
3382 $self->_set_value ($self->{value});
3383
3384 $self
3385}
3386
3387sub invoke_button_down {
3388 my ($self, $ev) = @_;
3389
3390 my @menu_items;
3391
3392 for (@{ $self->{options} }) {
3393 my ($value, $title, $tooltip) = @$_;
3394
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 }
3397
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399}
3400
3401sub _set_value {
3402 my ($self, $value) = @_;
3403
3404 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3405 or return;
3406
3407 $self->{value} = $item->[0];
3408 $self->set_markup ("$item->[1] ⇓");
3409 $self->set_tooltip ($item->[2]);
3410}
3411
3412sub set_value {
3413 my ($self, $value) = @_;
3414
3415 return unless $self->{value} ne $value;
3416
3417 $self->_set_value ($value);
3418 $self->emit (changed => $value);
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::Statusbox;
3424
3425our @ISA = CFClient::UI::VBox::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 3431 fontsize => 0.8,
3078 @_, 3432 @_,
3079 ) 3433 );
3434
3435 Scalar::Util::weaken (my $this = $self);
3436
3437 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438
3439 $self
3080} 3440}
3081 3441
3082sub reorder { 3442sub reorder {
3083 my ($self) = @_; 3443 my ($self) = @_;
3084 my $NOW = time; 3444 my $NOW = Time::HiRes::time;
3445
3446 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} };
3085 3450
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3451 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3452 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3453 }
3089 3454
… …
3092 my @items = sort { 3457 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3458 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3459 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3460 } values %{ $self->{item} };
3096 3461
3462 $self->{timer}->interval (1);
3463
3097 my $count = 10 + 1; 3464 my $count = 10 + 1;
3098 for my $item (@items) { 3465 for my $item (@items) {
3099 last unless --$count; 3466 last unless --$count;
3100 3467
3101 push @widgets, $item->{label} ||= do { 3468 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3469 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3470 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3471 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3472 : $item->{text};
3106 3473
… …
3114 tooltip => $item->{tooltip}, 3481 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3482 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3483 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3484 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3485 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3486 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3487 can_events => 1,
3121 can_hover => 1 3488 can_hover => 1
3122 }; 3489 };
3490
3491 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3492 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3493 $label->update;
3494 $label->set_max_size (undef, $label->{req_h} * $diff)
3495 if $diff < 1;
3496 $self->{timer}->interval (1/30);
3497 } else {
3498 $label->{fg}[3] = $item->{fg}[3] || 1;
3499 }
3500
3501 push @widgets, $label;
3123 } 3502 }
3124 3503
3125 $self->clear; 3504 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3505 $self->SUPER::add (reverse @widgets);
3127} 3506}
… …
3132 $text =~ s/^\s+//; 3511 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3512 $text =~ s/\s+$//;
3134 3513
3135 return unless $text; 3514 return unless $text;
3136 3515
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3516 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3517
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3518 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3519
3141 if (my $item = $self->{item}{$group}) { 3520 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3521 if ($item->{text} eq $text) {
3143 $item->{count}++; 3522 $item->{count}++;
3144 } else { 3523 } else {
3145 $item->{count} = 1; 3524 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 3525 $item->{text} = $item->{tooltip} = $text;
3147 } 3526 }
3148 $item->{id} = ++$self->{id}; 3527 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 3528 $item->{timeout} = $timeout;
3150 delete $item->{label}; 3529 delete $item->{label};
3151 } else { 3530 } else {
3152 $self->{item}{$group} = { 3531 $self->{item}{$group} = {
3153 id => ++$self->{id}, 3532 id => ++$self->{id},
… …
3159 count => 1, 3538 count => 1,
3160 %arg, 3539 %arg,
3161 }; 3540 };
3162 } 3541 }
3163 3542
3543 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 3544 $self->reorder;
3545 });
3165} 3546}
3166 3547
3167sub reconfigure { 3548sub reconfigure {
3168 my ($self) = @_; 3549 my ($self) = @_;
3169 3550
… …
3172 3553
3173 $self->reorder; 3554 $self->reorder;
3174 $self->SUPER::reconfigure; 3555 $self->SUPER::reconfigure;
3175} 3556}
3176 3557
3558sub destroy {
3559 my ($self) = @_;
3560
3561 $self->{timer}->cancel;
3562
3563 $self->SUPER::destroy;
3564}
3565
3177############################################################################# 3566#############################################################################
3178 3567
3179package CFClient::UI::Inventory; 3568package CFClient::UI::Inventory;
3180 3569
3181our @ISA = CFClient::UI::ScrolledWindow::; 3570our @ISA = CFClient::UI::Table::;
3182 3571
3183sub new { 3572sub new {
3184 my $class = shift; 3573 my $class = shift;
3185 3574
3186 my $self = $class->SUPER::new ( 3575 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3576 col_expand => [0, 1, 0],
3577 items => [],
3188 @_, 3578 @_,
3189 ); 3579 );
3190 3580
3581 $self->set_sort_order (undef);
3582
3191 $self 3583 $self
3584}
3585
3586sub update_items {
3587 my ($self) = @_;
3588
3589 $self->clear;
3590
3591 my @item = $self->{sort}->(@{ $self->{items} });
3592
3593 my @adds;
3594 my $row = 0;
3595 for my $item ($self->{sort}->(@{ $self->{items} })) {
3596 CFClient::Item::update_widgets $item;
3597
3598 push @adds, 0, $row, $item->{face_widget};
3599 push @adds, 1, $row, $item->{desc_widget};
3600 push @adds, 2, $row, $item->{weight_widget};
3601
3602 $row++;
3603 }
3604
3605 $self->add (@adds);
3606}
3607
3608sub set_sort_order {
3609 my ($self, $order) = @_;
3610
3611 $self->{sort} = $order ||= sub {
3612 sort {
3613 $a->{type} <=> $b->{type}
3614 or $a->{name} cmp $b->{name}
3615 } @_
3616 };
3617
3618 $self->update_items;
3192} 3619}
3193 3620
3194sub set_items { 3621sub set_items {
3195 my ($self, $items) = @_; 3622 my ($self, $items) = @_;
3196 3623
3197 $self->{child}->clear; 3624 $self->{items} = [$items ? values %$items : ()];
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets; 3625 $self->update_items;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414} 3626}
3415 3627
3416############################################################################# 3628#############################################################################
3417 3629
3418package CFClient::UI::SpellList; 3630package CFClient::UI::SpellList;
… …
3427 commands => [], 3639 commands => [],
3428 @_, 3640 @_,
3429 ) 3641 )
3430} 3642}
3431 3643
3432# XXX: Do sorting? Argl... 3644my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657sub rebuild_spell_list {
3658 my ($self) = @_;
3659
3660 $CFClient::UI::ROOT->on_refresh ($self => sub {
3661 $self->clear;
3662
3663 return unless $::CONN;
3664
3665 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671 my $row = 0;
3672
3673 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674 my $spell = $self->{spell}{$_};
3675
3676 $row++;
3677
3678 my $spell_cb = sub {
3679 my ($widget, $ev) = @_;
3680
3681 if ($ev->{button} == 1) {
3682 $::CONN->user_send ("cast $spell->{name}");
3683 } elsif ($ev->{button} == 2) {
3684 $::CONN->user_send ("invoke $spell->{name}");
3685 } elsif ($ev->{button} == 3) {
3686 (new CFClient::UI::Menu
3687 items => [
3688 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690 ],
3691 )->popup ($ev);
3692 } else {
3693 return 0;
3694 }
3695
3696 1
3697 };
3698
3699 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701 #TODO: add path info to tooltip
3702 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704 $self->add (0, $row, new CFClient::UI::Face
3705 face => $spell->{face},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (1, $row, new CFClient::UI::Label
3713 expand => 1,
3714 text => $spell->{name},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725 }
3726 });
3727}
3728
3433sub add_spell { 3729sub add_spell {
3434 my ($self, $spell) = @_; 3730 my ($self, $spell) = @_;
3731
3435 $self->{spells}->{$spell->{name}} = $spell; 3732 $self->{spell}->{$spell->{name}} = $spell;
3436 3733 $self->rebuild_spell_list;
3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464} 3734}
3465 3735
3466sub remove_spell { 3736sub remove_spell {
3467 my ($self, $spell) = @_; 3737 my ($self, $spell) = @_;
3738
3468 delete $self->{spells}->{$spell->{name}}; 3739 delete $self->{spell}->{$spell->{name}};
3469 $self->rebuild_spell_list; 3740 $self->rebuild_spell_list;
3470} 3741}
3471 3742
3743sub clear_spells {
3744 my ($self) = @_;
3745
3746 $self->{spell} = {};
3747 $self->rebuild_spell_list;
3748}
3749
3472############################################################################# 3750#############################################################################
3473 3751
3474package CFClient::UI::Root; 3752package CFClient::UI::Root;
3475 3753
3476our @ISA = CFClient::UI::Container::; 3754our @ISA = CFClient::UI::Container::;
3755
3756use List::Util qw(min max);
3477 3757
3478use CFClient::OpenGL; 3758use CFClient::OpenGL;
3479 3759
3480sub new { 3760sub new {
3481 my $class = shift; 3761 my $class = shift;
… …
3508 $coord = $max - $size if $coord > $max - $size; 3788 $coord = $max - $size if $coord > $max - $size;
3509 3789
3510 int $coord + 0.5 3790 int $coord + 0.5
3511} 3791}
3512 3792
3513sub size_allocate { 3793sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 3794 my ($self, $w, $h) = @_;
3515 3795
3516 for my $child ($self->children) { 3796 for my $child ($self->children) {
3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3797 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518 3798
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 3802 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 3803 $Y = _to_pixel $Y, $H, $self->{h};
3524 3804
3525 $child->configure ($X, $Y, $W, $H); 3805 $child->configure ($X, $Y, $W, $H);
3526 } 3806 }
3807
3808 1
3527} 3809}
3528 3810
3529sub coord2local { 3811sub coord2local {
3530 my ($self, $x, $y) = @_; 3812 my ($self, $x, $y) = @_;
3531 3813
… …
3616 3898
3617 delete $queue{$widget+0}; 3899 delete $queue{$widget+0};
3618 3900
3619 my ($w, $h) = $widget->size_request; 3901 my ($w, $h) = $widget->size_request;
3620 3902
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3903 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3904 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3905
3906 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3907 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 3908
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 3909 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 3910 $h = $widget->{force_h} if exists $widget->{force_h};
3626 3911
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3912 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3653 3938
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3939 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 3940
3656 $w = 0 if $w < 0; 3941 $w = 0 if $w < 0;
3657 $h = 0 if $h < 0; 3942 $h = 0 if $h < 0;
3943
3944 $w = max $widget->{min_w}, $w;
3945 $h = max $widget->{min_h}, $h;
3946
3947# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3948# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3949
3950 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3951 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3658 3952
3659 $w = int $w + 0.5; 3953 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 3954 $h = int $h + 0.5;
3661 3955
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3956 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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