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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.336 by root, Sun Jul 23 16:46:06 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#############################################################################
856
857# back-buffered drawing area
798 858
799package CFClient::UI::Window; 859package CFClient::UI::Window;
800 860
801our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
802 862
… …
813 873
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 875 $self->SUPER::update;
816} 876}
817 877
818sub size_allocate { 878sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
820 880
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
823} 884}
824 885
825sub _render { 886sub _render {
826 my ($self) = @_; 887 my ($self) = @_;
827 888
… …
854 my $tex = $self->{texture} 915 my $tex = $self->{texture}
855 or return; 916 or return;
856 917
857 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
860 921
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 923
863 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
864} 925}
… …
888 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
889 950
890 ($w, $h) 951 ($w, $h)
891} 952}
892 953
893sub size_allocate { 954sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
895 956
896 my $child = $self->child; 957 my $child = $self->child;
897 958
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 961
901 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
902 $self->update; 963 $self->update;
964
965 1
903} 966}
904 967
905sub set_offset { 968sub set_offset {
906 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
907 970
… …
970 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
971 }, 1034 },
972 ; 1035 ;
973 1036
974 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
975 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
976 slider => $slider, 1040 slider => $slider,
977 %arg, 1041 %arg,
978 ); 1042 );
979 1043
980 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
982 1046
983 $self 1047 $self
984} 1048}
985 1049
1050#TODO# update range on size_allocate depending on child
1051
986sub add { 1052sub add {
987 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
988 1054
989 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
990} 1056}
991 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
992sub update { 1074sub update {
993 my ($self) = @_; 1075 my ($self) = @_;
994 1076
995 $self->SUPER::update; 1077 $self->SUPER::update;
996 1078
997 # todo: overwrite size_allocate of child 1079 $self->update_slider;
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000} 1080}
1001 1081
1002sub size_allocate { 1082sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1004 1084
1085 $self->update_slider;
1086
1005 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009} 1088}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013 1089
1014############################################################################# 1090#############################################################################
1015 1091
1016package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1017 1093
… …
1033 1109
1034 if ($self->{bg}) { 1110 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
1036 1112
1037 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
1040 1116
1041 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1118 glVertex 0 , 0;
1043 glVertex 0 , $h; 1119 glVertex 0 , $h;
1044 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1068 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);
1069 1145
1070sub new { 1146sub new {
1071 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1072 1148
1073 my $title = delete $arg{title};
1074
1075 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1152 border => 0.6,
1079 can_events => 1, 1153 can_events => 1,
1080 min_w => 16, 1154 min_w => 64,
1081 min_h => 16, 1155 min_h => 32,
1082 %arg, 1156 %arg,
1083 ); 1157 );
1084 1158
1085 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1160 align => 0,
1087 valign => 1, 1161 valign => 1,
1088 text => $title, 1162 text => $self->{title},
1089 fontsize => $self->{border} 1163 fontsize => $self->{border},
1090 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 }
1091 1174
1092 $self 1175 $self
1093} 1176}
1094 1177
1095sub add { 1178sub add {
1096 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1097 1180
1098 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1184}
1101 1185
1102sub border { 1186sub border {
1103 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1104} 1188}
1105 1189
1106sub size_request { 1190sub size_request {
1107 my ($self) = @_; 1191 my ($self) = @_;
1108 1192
1109 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1110 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1111 1198
1112 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1113 1200
1114 ( 1201 (
1115 $w + $self->border * 2, 1202 $w + $self->border * 2,
1116 $h + $self->border * 2, 1203 $h + $self->border * 2,
1117 ) 1204 )
1118} 1205}
1119 1206
1120sub size_allocate { 1207sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1122 1209
1123 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1214 }
1128 1215
1129 my $border = $self->border; 1216 my $border = $self->border;
1130 1217
1131 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1132 $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;
1133 1233
1134 $self->child->configure ($border, $border, $w, $h); 1234 1
1135} 1235}
1136 1236
1137sub button_down { 1237sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1139 1239
1140 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1241 my $border = $self->border;
1142 1242
… …
1158 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1159 1259
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1264 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1265 };
1166 1266
1167 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1173 1273
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1275
1176 $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});
1177 }; 1279 };
1178 } else { 1280 } else {
1179 return 0; 1281 return 0;
1180 } 1282 }
1181 1283
1182 1 1284 1
1183} 1285}
1184 1286
1185sub button_up { 1287sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1187 1289
1188 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1189} 1291}
1190 1292
1191sub mouse_motion { 1293sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1193 1295
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1297
1196 !!$self->{motion} 1298 ! ! $self->{motion}
1197} 1299}
1198 1300
1199sub _draw { 1301sub _draw {
1200 my ($self) = @_; 1302 my ($self) = @_;
1201 1303
… …
1227 1329
1228 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1229 1331
1230 $child->draw; 1332 $child->draw;
1231 1333
1232 if ($self->{title}) { 1334 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1335 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1235 } 1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1236} 1343}
1237 1344
1238############################################################################# 1345#############################################################################
1239 1346
1240package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1257sub children { 1364sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1259} 1366}
1260 1367
1261sub add { 1368sub add {
1262 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1263 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1264 $child->set_parent ($self); 1373 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1266 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1267 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1268} 1386}
1269 1387
1270# 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?
1271sub clear { 1389sub clear {
1272 my ($self) = @_; 1390 my ($self) = @_;
… …
1313 (sum @$ws), 1431 (sum @$ws),
1314 (sum @$hs), 1432 (sum @$hs),
1315 ) 1433 )
1316} 1434}
1317 1435
1318sub size_allocate { 1436sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1320 1438
1321 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1322 1440
1323 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1355 } 1473 }
1356 1474
1357 $y += $row_h; 1475 $y += $row_h;
1358 } 1476 }
1359 1477
1478 1
1360} 1479}
1361 1480
1362sub find_widget { 1481sub find_widget {
1363 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1364 1483
… …
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1522 )
1404} 1523}
1405 1524
1406sub size_allocate { 1525sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1408 1527
1409 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1411 1530
1412 my @req; 1531 my @req;
1413 1532
1414 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1416 } else { 1535 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1419 1538
1420 if ($req > $space) { 1539 if ($req > $space) {
1421 # ah well, not enough space 1540 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1423 } else { 1542 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1544
1426 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1427 1546
1428 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1548 for 0 .. $#children;
1430 } 1549 }
1431 } 1550 }
1432 1551
1433 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1434 1553
1435 my $pos = 0; 1554 my $pos = 0;
1436 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1438 $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));
1439 1558
1440 $pos += $alloc; 1559 $pos += $alloc;
1441 } 1560 }
1442 1561
1443 1 1562 1
… …
1516 } 1635 }
1517 1636
1518 $self 1637 $self
1519} 1638}
1520 1639
1521sub escape($) {
1522 local $_ = $_[0];
1523
1524 s/&/&amp;/g;
1525 s/>/&gt;/g;
1526 s/</&lt;/g;
1527
1528 $_
1529}
1530
1531sub update { 1640sub update {
1532 my ($self) = @_; 1641 my ($self) = @_;
1533 1642
1534 delete $self->{texture}; 1643 delete $self->{texture};
1535 $self->SUPER::update; 1644 $self->SUPER::update;
1536} 1645}
1537 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1538sub set_text { 1654sub set_text {
1539 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1540 1656
1541 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1543 1659
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1546 1661
1662 delete $self->{size_req};
1547 $self->realloc; 1663 $self->realloc;
1548 $self->update; 1664 $self->update;
1549} 1665}
1550 1666
1551sub set_markup { 1667sub set_markup {
… …
1554 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1556 1672
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1674
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1561 1676
1677 delete $self->{size_req};
1562 $self->realloc; 1678 $self->realloc;
1563 $self->update; 1679 $self->update;
1564} 1680}
1565 1681
1566sub size_request { 1682sub size_request {
1567 my ($self) = @_; 1683 my ($self) = @_;
1568 1684
1685 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1691
1575 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1576 1693
1577 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1578 $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);
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1698
1581 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1582 1700
1583 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1585 } 1706 };
1586 1707
1587 ($w, $h) 1708 @{ $self->{size_req} }
1588} 1709}
1589 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1590sub size_allocate { 1715sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1592 1717
1593 delete $self->{ox}; 1718 delete $self->{ox};
1594 1719
1595 delete $self->{texture} 1720 delete $self->{texture}
1596 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
1597} 1724}
1598 1725
1599sub set_fontsize { 1726sub set_fontsize {
1600 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1601 1728
1602 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1603 delete $self->{texture}; 1731 delete $self->{texture};
1604 1732
1605 $self->realloc; 1733 $self->realloc;
1606} 1734}
1607 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1608sub _draw { 1745sub _draw {
1609 my ($self) = @_; 1746 my ($self) = @_;
1610 1747
1611 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1612 1749
1613 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1616 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620 1757
1621 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1622 }; 1759 };
1623 1760
1624 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1627 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1628 1765
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1632 }; 1769 };
1633 1770
1634 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1636 1773
1637 if ($tex->{format} == GL_ALPHA) { 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1638 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 }
1643
1644 glDisable GL_TEXTURE_2D;
1645} 1775}
1646 1776
1647############################################################################# 1777#############################################################################
1648 1778
1649package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1663 can_hover => 1, 1793 can_hover => 1,
1664 can_focus => 1, 1794 can_focus => 1,
1665 valign => 0, 1795 valign => 0,
1666 can_events => 1, 1796 can_events => 1,
1667 #text => ... 1797 #text => ...
1798 #hidden => "*",
1668 @_ 1799 @_
1669 ) 1800 )
1670} 1801}
1671 1802
1672sub _set_text { 1803sub _set_text {
… …
1674 1805
1675 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1676 1807
1677 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1678 1809
1679 delete $self->{texture};
1680
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;
1820 $self->update;
1688} 1821}
1689 1822
1690sub set_text { 1823sub set_text {
1691 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1692 1825
1693 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1827 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1828}
1698 1829
1699sub get_text { 1830sub get_text {
1700 $_[0]{text} 1831 $_[0]{text}
1701} 1832}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1707 1838
1708 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1709} 1840}
1710 1841
1711sub key_down { 1842sub invoke_key_down {
1712 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1713 1844
1714 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1864 $self->emit ('escape');
1734 } elsif ($uni) { 1865 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1867 } else {
1737 return 0; 1868 return 0;
1738 } 1869 }
… …
1742 $self->realloc; 1873 $self->realloc;
1743 1874
1744 1 1875 1
1745} 1876}
1746 1877
1747sub focus_in { 1878sub invoke_focus_in {
1748 my ($self) = @_; 1879 my ($self) = @_;
1749 1880
1750 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1751 1882
1752 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1753} 1884}
1754 1885
1755sub button_down { 1886sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1757 1888
1758 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1890
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1892
1762 # byte-index to char-index 1893 # byte-index to char-index
1763 my $text = $self->{text}; 1894 my $text = $self->{text};
1764 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1766 1897
1767 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1768 $self->update; 1899 $self->update;
1769 1900
1770 1 1901 1
1771} 1902}
1772 1903
1773sub mouse_motion { 1904sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 1907
1777 0 1908 1
1778} 1909}
1779 1910
1780sub _draw { 1911sub _draw {
1781 my ($self) = @_; 1912 my ($self) = @_;
1782 1913
1783 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1784 1915
1785 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1788 } else { 1919 } else {
1789 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1790 } 1921 }
1791 1922
1792 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1926 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1823 1954
1824our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1825 1956
1826use CFClient::OpenGL; 1957use CFClient::OpenGL;
1827 1958
1828sub key_down { 1959sub invoke_key_down {
1829 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1830 1961
1831 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1832 1963
1833 if ($sym == 13) { 1964 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1836 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1839 $self->update; 1971 $self->update;
1840 1972
1841 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1991 } else {
1860 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1861 } 1993 }
1862 1994
1863 } else { 1995 } else {
1864 return $self->SUPER::key_down ($ev) 1996 return $self->SUPER::invoke_key_down ($ev)
1865 } 1997 }
1866 1998
1867 1 1999 1
1868} 2000}
1869 2001
… …
1893 can_events => 1, 2025 can_events => 1,
1894 @_ 2026 @_
1895 ) 2027 )
1896} 2028}
1897 2029
1898sub activate { }
1899
1900sub button_up { 2030sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1902 2032
1903 $self->emit ("activate") 2033 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
… …
1908} 2038}
1909 2039
1910sub _draw { 2040sub _draw {
1911 my ($self) = @_; 2041 my ($self) = @_;
1912 2042
1913 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 2044
1919 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1922 2048
… …
1959 my ($self) = @_; 2085 my ($self) = @_;
1960 2086
1961 (6) x 2 2087 (6) x 2
1962} 2088}
1963 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1964sub button_down { 2098sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1966 2100
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2103 $self->toggle;
1970 $self->_emit (changed => $self->{state});
1971 } else { 2104 } else {
1972 return 0 2105 return 0
1973 } 2106 }
1974 2107
1975 1 2108 1
… …
2000package CFClient::UI::Image; 2133package CFClient::UI::Image;
2001 2134
2002our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
2003 2136
2004use CFClient::OpenGL; 2137use CFClient::OpenGL;
2005use Carp qw/confess/;
2006 2138
2007our %loaded_images; 2139our %texture_cache;
2008 2140
2009sub new { 2141sub new {
2010 my $class = shift; 2142 my $class = shift;
2011 2143
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
2013 2148
2014 $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";
2015 2151
2016 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2017 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;
2018 2154
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
2020 2156
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2158
2025 $self 2159 $self
2026} 2160}
2027 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
2028sub size_request { 2177sub size_request {
2029 my ($self) = @_; 2178 my ($self) = @_;
2030 2179
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2032} 2181}
2033 2182
2034sub _draw { 2183sub _draw {
2035 my ($self) = @_; 2184 my ($self) = @_;
2036 2185
… …
2046 } 2195 }
2047 2196
2048 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
2049 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2050 2199
2051 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
2052 2201
2053 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
2054} 2239}
2055 2240
2056############################################################################# 2241#############################################################################
2057 2242
2058package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2145 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
2146 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
2147 2332
2148 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
2149 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);
2150 2338
2151 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
2152 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;
2153 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2344
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2345 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2346 glBegin GL_QUADS;
… …
2172 2361
2173 if ($t3) { 2362 if ($t3) {
2174 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
2175 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
2176 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2177 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2178 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2179 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2180 glEnd; 2369 glEnd;
2181 } 2370 }
2182 2371
2183 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2271 $self->update; 2460 $self->update;
2272 2461
2273 $self 2462 $self
2274} 2463}
2275 2464
2276sub changed { }
2277
2278sub set_range { 2465sub set_range {
2279 my ($self, $range) = @_; 2466 my ($self, $range) = @_;
2280 2467
2281 ($range, $self->{range}) = ($self->{range}, $range); 2468 ($range, $self->{range}) = ($self->{range}, $range);
2282 2469
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2470 if ("@$range" ne "@{$self->{range}}") {
2471 $self->update;
2472 $self->set_value ($self->{range}[0]);
2473 }
2285} 2474}
2286 2475
2287sub set_value { 2476sub set_value {
2288 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2289 2478
… …
2300 if $unit; 2489 if $unit;
2301 2490
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2492
2304 if ($value != $old_value) { 2493 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2494 $self->emit (changed => $value);
2306 $self->update; 2495 $self->update;
2307 } 2496 }
2308} 2497}
2309 2498
2310sub size_request { 2499sub size_request {
2311 my ($self) = @_; 2500 my ($self) = @_;
2312 2501
2313 ($self->{req_w}, $self->{req_h}) 2502 ($self->{req_w}, $self->{req_h})
2314} 2503}
2315 2504
2316sub button_down { 2505sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2318 2507
2319 $self->SUPER::button_down ($ev, $x, $y); 2508 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2509
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2511
2323 $self->mouse_motion ($ev, $x, $y) 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2324} 2513}
2325 2514
2326sub mouse_motion { 2515sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2328 2517
2329 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2520
… …
2339 } 2528 }
2340 2529
2341 1 2530 1
2342} 2531}
2343 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
2541}
2542
2344sub update { 2543sub update {
2345 my ($self) = @_; 2544 my ($self) = @_;
2346 2545
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2546 delete $self->{knob_w};
2547 $self->SUPER::update;
2548}
2549
2550sub _draw {
2551 my ($self) = @_;
2552
2553 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2554 $self->set_value ($self->{range}[0]);
2349 2555
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2556 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2557 my $range = ($hi - $page - $lo) || 1e-100;
2352 2558
… …
2358 $value = ($value - $lo) / $range; 2564 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2565 $value = $value * $self->{scale} + $self->{offset};
2360 2566
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2567 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2568 $self->{knob_w} = $knob_w;
2363 }); 2569 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2570
2371 $self->SUPER::_draw (); 2571 $self->SUPER::_draw ();
2372 2572
2373 glScale $self->{w}, $self->{h}; 2573 glScale $self->{w}, $self->{h};
2374 2574
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2635sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2636sub set_value { shift->{slider}->set_value (@_) }
2437 2637
2438############################################################################# 2638#############################################################################
2439 2639
2440package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2441 2641
2442our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2443 2643
2444use CFClient::OpenGL; 2644use CFClient::OpenGL;
2445 2645
2446sub new { 2646sub new {
2447 my $class = shift; 2647 my $class = shift;
2448 2648
2449 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2450 fontsize => 1, 2650 fontsize => 1,
2451 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2452 #font => default_font 2653 #font => default_font
2453 @_, 2654 @_,
2454 2655
2455 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2456 par => [], 2657 par => [],
2457 height => 0, 2658 height => 0,
2458 children => [ 2659 children => [
2459 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2471 2672
2472 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2674 $self->reflow;
2474} 2675}
2475 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
2476sub size_allocate { 2686sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2687 my ($self, $w, $h) = @_;
2478 2688
2479 $self->SUPER::size_allocate ($w, $h); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2691
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $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});
2484 2696
2485 $self->reflow; 2697 $self->reflow;
2486}
2487 2698
2488sub text_size { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2489 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) = @_;
2490 2715
2491 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2492 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $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});
2495 $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}}
2496 2729 );
2730
2497 $layout->size 2731 $layout
2498} 2732}
2499 2733
2500sub reflow { 2734sub reflow {
2501 my ($self) = @_; 2735 my ($self) = @_;
2502 2736
… …
2511 $self->{children}[1]->set_value ($offset); 2745 $self->{children}[1]->set_value ($offset);
2512} 2746}
2513 2747
2514sub clear { 2748sub clear {
2515 my ($self) = @_; 2749 my ($self) = @_;
2750
2751 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other;
2516 2753
2517 $self->{par} = []; 2754 $self->{par} = [];
2518 $self->{height} = 0; 2755 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2757}
2521 2758
2522sub add_paragraph { 2759sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2760 my ($self, $color, $para, $indent) = @_;
2524 2761
2525 for my $line (split /\n/, $text) { 2762 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2763
2527 $self->{height} += $h; 2764 $para = {
2528 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,
2529 } 2771 };
2530 2772
2531 $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;
2532} 2785}
2533 2786
2534sub update { 2787sub update {
2535 my ($self) = @_; 2788 my ($self) = @_;
2536 2789
… …
2538 2791
2539 return unless $self->{h} > 0; 2792 return unless $self->{h} > 0;
2540 2793
2541 delete $self->{texture}; 2794 delete $self->{texture};
2542 2795
2543 $ROOT->on_post_alloc ($self, sub { 2796 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2798
2546 if (delete $self->{need_reflow}) { 2799 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2800 my $height = 0;
2548 2801
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2802 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2804 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2805 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2806
2559 $_->[1] = $h; 2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2560 } 2810 }
2561 2811
2562 $height += $_->[1]; 2812 $height += $para->{h};
2563 } 2813 }
2564 2814
2565 $self->{height} = $height; 2815 $self->{height} = $height;
2566 2816
2567 $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]);
2568 2818
2569 delete $self->{texture}; 2819 delete $self->{texture};
2570 } 2820 }
2571 2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2827 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2828 glClear GL_COLOR_BUFFER_BIT;
2575 2829
2576 my $top = int $self->{children}[1]{range}[0]; 2830 my $top = int $self->{children}[1]{range}[0];
2577 2831
2578 my $y0 = $top; 2832 my $y0 = $top;
2579 my $y1 = $top + $H; 2833 my $y1 = $top + $H;
2580 2834
2581 my $y = 0; 2835 my $y = 0;
2582 2836
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 2837 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2838 my $h = $para->{h};
2593 2839
2594 if ($y0 < $y + $h && $y < $y1) { 2840 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 2841
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2842 my $layout = $self->get_layout ($para);
2600 2843
2601 glRasterPos $par->[3], $y - $y0; 2844 $layout->render ($para->{indent}, $y - $y0);
2602 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 }
2603 } 2858 }
2604 2859
2605 $y += $h; 2860 $y += $h;
2606 } 2861 }
2607
2608 glDisable GL_BLEND;
2609 }; 2862 };
2610 }); 2863 });
2611} 2864}
2612 2865
2866sub reconfigure {
2867 my ($self) = @_;
2868
2869 $self->SUPER::reconfigure;
2870
2871 $_->{w} = 1e10 for @{ $self->{par} };
2872 $self->reflow;
2873}
2874
2613sub _draw { 2875sub _draw {
2614 my ($self) = @_; 2876 my ($self) = @_;
2615 2877
2616 glEnable GL_TEXTURE_2D; 2878 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2880 glColor 0, 0, 0, 1;
2619 $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});
2620 glDisable GL_TEXTURE_2D; 2882 glDisable GL_TEXTURE_2D;
2621 2883
2622 $self->{children}[1]->draw; 2884 $self->{children}[1]->draw;
2623
2624} 2885}
2625 2886
2626############################################################################# 2887#############################################################################
2627 2888
2628package CFClient::UI::Animator; 2889package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2976 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2977 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2978 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2979 . "visible $widget->{visible}";
2719 } 2980 }
2981
2982 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//;
2720 2984
2721 $self->add (new CFClient::UI::Label 2985 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2986 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2988 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2998 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2999
2736 ($w + 4, $h + 4) 3000 ($w + 4, $h + 4)
2737} 3001}
2738 3002
2739sub size_allocate { 3003sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 3004 my ($self, $w, $h) = @_;
2741 3005
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 3006 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 3007}
2744 3008
2745sub visibility_change { 3009sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 3010 my ($self, $visible) = @_;
2747 3011
2748 return unless $visible; 3012 return unless $visible;
2749 3013
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 3014 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner} 3015 my $widget = $self->{owner}
2752 or return; 3016 or return;
2753 3017
3018 if ($widget->{visible}) {
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3019 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 3020
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3021 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 3022 if $x + $self->{w} > $self->{root}{w};
2758 3023
2759 $self->move_abs ($x, $y); 3024 $self->move_abs ($x, $y);
3025 } else {
3026 $self->hide;
3027 }
2760 }); 3028 });
2761} 3029}
2762 3030
2763sub _draw { 3031sub _draw {
2764 my ($self) = @_; 3032 my ($self) = @_;
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3119 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 3120
2853 if ($tex) { 3121 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3122 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3124 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3125 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3126 glDisable GL_TEXTURE_2D;
2859 } 3127 }
2860} 3128}
2861 3129
2862sub DESTROY { 3130sub destroy {
2863 my ($self) = @_; 3131 my ($self) = @_;
2864 3132
2865 $self->{timer}->cancel 3133 $self->{timer}->cancel
2866 if $self->{timer}; 3134 if $self->{timer};
2867 3135
2868 $self->SUPER::DESTROY; 3136 $self->SUPER::destroy;
2869} 3137}
2870 3138
2871############################################################################# 3139#############################################################################
2872 3140
2873package CFClient::UI::Buttonbar; 3141package CFClient::UI::Buttonbar;
… …
2894 ); 3162 );
2895 3163
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3164 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3165
2898 for my $item (@{ $self->{items} }) { 3166 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3167 my ($widget, $cb, $tooltip) = @$item;
2900 3168
2901 # handle various types of items, only text for now 3169 # handle various types of items, only text for now
2902 if (!ref $widget) { 3170 if (!ref $widget) {
3171 if ($widget =~ /\t/) {
3172 my ($left, $right) = split /\t/, $widget, 2;
3173
3174 $widget = new CFClient::UI::HBox
3175 can_hover => 1,
3176 can_events => 1,
3177 tooltip => $tooltip,
3178 children => [
3179 (new CFClient::UI::Label markup => $left, expand => 1),
3180 (new CFClient::UI::Label markup => $right, align => +1),
3181 ],
3182 ;
3183
3184 } else {
2903 $widget = new CFClient::UI::Label 3185 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3186 can_hover => 1,
2905 can_events => 1, 3187 can_events => 1,
2906 text => $widget; 3188 markup => $widget,
3189 tooltip => $tooltip;
3190 }
2907 } 3191 }
2908 3192
2909 $self->{item}{$widget} = $item; 3193 $self->{item}{$widget} = $item;
2910 3194
2911 $self->{vbox}->add ($widget); 3195 $self->{vbox}->add ($widget);
… …
2916 3200
2917# popup given the event (must be a mouse button down event currently) 3201# popup given the event (must be a mouse button down event currently)
2918sub popup { 3202sub popup {
2919 my ($self, $ev) = @_; 3203 my ($self, $ev) = @_;
2920 3204
2921 $self->_emit ("popdown"); 3205 $self->emit ("popdown");
2922 3206
2923 # maybe save $GRAB? must be careful about events... 3207 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3208 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3209 $self->{button} = $ev->{button};
2926 3210
2927 $self->show; 3211 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3212 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3213}
2930 3214
2931sub mouse_motion { 3215sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3216 my ($self, $ev, $x, $y) = @_;
2933 3217
2934 # TODO: should use vbox->find_widget or so 3218 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3219 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3220 $self->{hover} = $self->{item}{$HOVER};
2937 3221
2938 0 3222 0
2939} 3223}
2940 3224
2941sub button_up { 3225sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3226 my ($self, $ev, $x, $y) = @_;
2943 3227
2944 if ($ev->{button} == $self->{button}) { 3228 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3229 undef $GRAB;
2946 $self->hide; 3230 $self->hide;
2947 3231
2948 $self->_emit ("popdown"); 3232 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3233 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3234 } else {
2951 return 0 3235 return 0
2952 } 3236 }
2953 3237
… …
2980 3264
2981 $self->{current} = $self->{children}[0] 3265 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3266 if @{ $self->{children} };
2983} 3267}
2984 3268
3269sub get_current_page {
3270 my ($self) = @_;
3271
3272 $self->{current}
3273}
3274
2985sub set_current_page { 3275sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3276 my ($self, $page_or_widget) = @_;
2987 3277
2988 my $widget = ref $page_or_widget 3278 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3279 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3280 : $self->{children}[$page_or_widget];
2991 3281
2992 $self->{current} = $widget; 3282 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3283 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3284
2995 $self->_emit (page_changed => $self->{current}); 3285 $self->emit (page_changed => $self->{current});
2996 3286
2997 $self->realloc; 3287 $self->realloc;
2998} 3288}
2999 3289
3000sub visible_children { 3290sub visible_children {
… …
3005 my ($self) = @_; 3295 my ($self) = @_;
3006 3296
3007 $self->{current}->size_request 3297 $self->{current}->size_request
3008} 3298}
3009 3299
3010sub size_allocate { 3300sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3301 my ($self, $w, $h) = @_;
3012 3302
3013 $self->{current}->configure (0, 0, $w, $h); 3303 $self->{current}->configure (0, 0, $w, $h);
3304
3305 1
3014} 3306}
3015 3307
3016sub _draw { 3308sub _draw {
3017 my ($self) = @_; 3309 my ($self) = @_;
3018 3310
… …
3053 ); 3345 );
3054 3346
3055 $self->{multiplexer}->add ($widget); 3347 $self->{multiplexer}->add ($widget);
3056} 3348}
3057 3349
3350sub get_current_page {
3351 my ($self) = @_;
3352
3353 $self->{multiplexer}->get_current_page
3354}
3355
3058sub set_current_page { 3356sub set_current_page {
3059 my ($self, $page) = @_; 3357 my ($self, $page) = @_;
3060 3358
3061 $self->{multiplexer}->set_current_page ($page); 3359 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3360 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3361}
3064 3362
3065############################################################################# 3363#############################################################################
3066 3364
3067package CFClient::UI::Statusbox; 3365package CFClient::UI::Combobox;
3068 3366
3367use utf8;
3368
3069our @ISA = CFClient::UI::VBox::; 3369our @ISA = CFClient::UI::Button::;
3070 3370
3071sub new { 3371sub new {
3072 my $class = shift; 3372 my $class = shift;
3073 3373
3074 $class->SUPER::new ( 3374 my $self = $class->SUPER::new (
3375 options => [], # [value, title, longdesc], ...
3376 value => undef,
3377 @_,
3378 );
3379
3380 $self->_set_value ($self->{value});
3381
3382 $self
3383}
3384
3385sub invoke_button_down {
3386 my ($self, $ev) = @_;
3387
3388 my @menu_items;
3389
3390 for (@{ $self->{options} }) {
3391 my ($value, $title, $tooltip) = @$_;
3392
3393 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3394 }
3395
3396 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3397}
3398
3399sub _set_value {
3400 my ($self, $value) = @_;
3401
3402 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3403 or return;
3404
3405 $self->{value} = $item->[0];
3406 $self->set_markup ("$item->[1] ⇓");
3407 $self->set_tooltip ($item->[2]);
3408}
3409
3410sub set_value {
3411 my ($self, $value) = @_;
3412
3413 return unless $self->{value} ne $value;
3414
3415 $self->_set_value ($value);
3416 $self->emit (changed => $value);
3417}
3418
3419#############################################################################
3420
3421package CFClient::UI::Statusbox;
3422
3423our @ISA = CFClient::UI::VBox::;
3424
3425sub new {
3426 my $class = shift;
3427
3428 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3429 fontsize => 0.8,
3076 @_, 3430 @_,
3077 ) 3431 );
3432
3433 Scalar::Util::weaken (my $this = $self);
3434
3435 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3436
3437 $self
3078} 3438}
3079 3439
3080sub reorder { 3440sub reorder {
3081 my ($self) = @_; 3441 my ($self) = @_;
3082 my $NOW = time; 3442 my $NOW = Time::HiRes::time;
3443
3444 # freeze display when hovering over any label
3445 return if $CFClient::UI::TOOLTIP->{owner}
3446 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3447 values %{ $self->{item} };
3083 3448
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3449 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3450 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3451 }
3087 3452
… …
3090 my @items = sort { 3455 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3456 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3457 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3458 } values %{ $self->{item} };
3094 3459
3460 $self->{timer}->interval (1);
3461
3095 my $count = 10 + 1; 3462 my $count = 10 + 1;
3096 for my $item (@items) { 3463 for my $item (@items) {
3097 last unless --$count; 3464 last unless --$count;
3098 3465
3099 push @widgets, $item->{label} ||= do { 3466 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3467 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3468 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3469 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3470 : $item->{text};
3104 3471
… …
3112 tooltip => $item->{tooltip}, 3479 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3480 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3481 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3482 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3483 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3484 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3485 can_events => 1,
3119 can_hover => 1 3486 can_hover => 1
3120 }; 3487 };
3488
3489 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3490 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3491 $label->update;
3492 $label->set_max_size (undef, $label->{req_h} * $diff)
3493 if $diff < 1;
3494 $self->{timer}->interval (1/30);
3495 } else {
3496 $label->{fg}[3] = $item->{fg}[3] || 1;
3497 }
3498
3499 push @widgets, $label;
3121 } 3500 }
3122 3501
3123 $self->clear; 3502 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3503 $self->SUPER::add (reverse @widgets);
3125} 3504}
… …
3130 $text =~ s/^\s+//; 3509 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3510 $text =~ s/\s+$//;
3132 3511
3133 return unless $text; 3512 return unless $text;
3134 3513
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3514 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3515
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3516 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3517
3139 if (my $item = $self->{item}{$group}) { 3518 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3519 if ($item->{text} eq $text) {
3141 $item->{count}++; 3520 $item->{count}++;
3142 } else { 3521 } else {
3143 $item->{count} = 1; 3522 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3523 $item->{text} = $item->{tooltip} = $text;
3145 } 3524 }
3146 $item->{id} = ++$self->{id}; 3525 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3526 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3527 delete $item->{label};
3149 } else { 3528 } else {
3150 $self->{item}{$group} = { 3529 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3530 id => ++$self->{id},
… …
3157 count => 1, 3536 count => 1,
3158 %arg, 3537 %arg,
3159 }; 3538 };
3160 } 3539 }
3161 3540
3541 $ROOT->on_refresh (reorder => sub {
3162 $self->reorder; 3542 $self->reorder;
3543 });
3163} 3544}
3164 3545
3165sub reconfigure { 3546sub reconfigure {
3166 my ($self) = @_; 3547 my ($self) = @_;
3167 3548
… …
3170 3551
3171 $self->reorder; 3552 $self->reorder;
3172 $self->SUPER::reconfigure; 3553 $self->SUPER::reconfigure;
3173} 3554}
3174 3555
3556sub destroy {
3557 my ($self) = @_;
3558
3559 $self->{timer}->cancel;
3560
3561 $self->SUPER::destroy;
3562}
3563
3175############################################################################# 3564#############################################################################
3176 3565
3177package CFClient::UI::Inventory; 3566package CFClient::UI::Inventory;
3178 3567
3179our @ISA = CFClient::UI::ScrolledWindow::; 3568our @ISA = CFClient::UI::Table::;
3180 3569
3181sub new { 3570sub new {
3182 my $class = shift; 3571 my $class = shift;
3183 3572
3184 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3574 col_expand => [0, 1, 0],
3575 items => [],
3186 @_, 3576 @_,
3187 ); 3577 );
3188 3578
3579 $self->set_sort_order (undef);
3580
3189 $self 3581 $self
3582}
3583
3584sub update_items {
3585 my ($self) = @_;
3586
3587 $self->clear;
3588
3589 my @item = $self->{sort}->(@{ $self->{items} });
3590
3591 my @adds;
3592 my $row = 0;
3593 for my $item ($self->{sort}->(@{ $self->{items} })) {
3594 CFClient::Item::update_widgets $item;
3595
3596 push @adds, 0, $row, $item->{face_widget};
3597 push @adds, 1, $row, $item->{desc_widget};
3598 push @adds, 2, $row, $item->{weight_widget};
3599
3600 $row++;
3601 }
3602
3603 $self->add (@adds);
3604}
3605
3606sub set_sort_order {
3607 my ($self, $order) = @_;
3608
3609 $self->{sort} = $order ||= sub {
3610 sort {
3611 $a->{type} <=> $b->{type}
3612 or $a->{name} cmp $b->{name}
3613 } @_
3614 };
3615
3616 $self->update_items;
3190} 3617}
3191 3618
3192sub set_items { 3619sub set_items {
3193 my ($self, $items) = @_; 3620 my ($self, $items) = @_;
3194 3621
3195 $self->{child}->clear; 3622 $self->{items} = [$items ? values %$items : ()];
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets; 3623 $self->update_items;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412} 3624}
3413 3625
3414############################################################################# 3626#############################################################################
3415 3627
3416package CFClient::UI::SpellList; 3628package CFClient::UI::SpellList;
… …
3425 commands => [], 3637 commands => [],
3426 @_, 3638 @_,
3427 ) 3639 )
3428} 3640}
3429 3641
3430# XXX: Do sorting? Argl... 3642my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3643
3644my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3645 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3646my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3648my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3652my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3654
3655sub rebuild_spell_list {
3656 my ($self) = @_;
3657
3658 $CFClient::UI::ROOT->on_refresh ($self => sub {
3659 $self->clear;
3660
3661 return unless $::CONN;
3662
3663 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3664 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3665 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3666 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3667 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3668
3669 my $row = 0;
3670
3671 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3672 my $spell = $self->{spell}{$_};
3673
3674 $row++;
3675
3676 my $spell_cb = sub {
3677 my ($widget, $ev) = @_;
3678
3679 if ($ev->{button} == 1) {
3680 $::CONN->user_send ("cast $spell->{name}");
3681 } elsif ($ev->{button} == 2) {
3682 $::CONN->user_send ("invoke $spell->{name}");
3683 } elsif ($ev->{button} == 3) {
3684 (new CFClient::UI::Menu
3685 items => [
3686 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3687 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3688 ],
3689 )->popup ($ev);
3690 } else {
3691 return 0;
3692 }
3693
3694 1
3695 };
3696
3697 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3698
3699 #TODO: add path info to tooltip
3700 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3701
3702 $self->add (0, $row, new CFClient::UI::Face
3703 face => $spell->{face},
3704 can_hover => 1,
3705 can_events => 1,
3706 tooltip => $tooltip,
3707 on_button_down => $spell_cb,
3708 );
3709
3710 $self->add (1, $row, new CFClient::UI::Label
3711 expand => 1,
3712 text => $spell->{name},
3713 can_hover => 1,
3714 can_events => 1,
3715 tooltip => $tooltip,
3716 on_button_down => $spell_cb,
3717 );
3718
3719 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3720 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3721 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3722 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3723 }
3724 });
3725}
3726
3431sub add_spell { 3727sub add_spell {
3432 my ($self, $spell) = @_; 3728 my ($self, $spell) = @_;
3729
3433 $self->{spells}->{$spell->{name}} = $spell; 3730 $self->{spell}->{$spell->{name}} = $spell;
3434 3731 $self->rebuild_spell_list;
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462} 3732}
3463 3733
3464sub remove_spell { 3734sub remove_spell {
3465 my ($self, $spell) = @_; 3735 my ($self, $spell) = @_;
3736
3466 delete $self->{spells}->{$spell->{name}}; 3737 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3738 $self->rebuild_spell_list;
3468} 3739}
3469 3740
3741sub clear_spells {
3742 my ($self) = @_;
3743
3744 $self->{spell} = {};
3745 $self->rebuild_spell_list;
3746}
3747
3470############################################################################# 3748#############################################################################
3471 3749
3472package CFClient::UI::Root; 3750package CFClient::UI::Root;
3473 3751
3474our @ISA = CFClient::UI::Container::; 3752our @ISA = CFClient::UI::Container::;
3753
3754use List::Util qw(min max);
3475 3755
3476use CFClient::OpenGL; 3756use CFClient::OpenGL;
3477 3757
3478sub new { 3758sub new {
3479 my $class = shift; 3759 my $class = shift;
… …
3506 $coord = $max - $size if $coord > $max - $size; 3786 $coord = $max - $size if $coord > $max - $size;
3507 3787
3508 int $coord + 0.5 3788 int $coord + 0.5
3509} 3789}
3510 3790
3511sub size_allocate { 3791sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 3792 my ($self, $w, $h) = @_;
3513 3793
3514 for my $child ($self->children) { 3794 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3795 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516 3796
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 3800 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 3801 $Y = _to_pixel $Y, $H, $self->{h};
3522 3802
3523 $child->configure ($X, $Y, $W, $H); 3803 $child->configure ($X, $Y, $W, $H);
3524 } 3804 }
3805
3806 1
3525} 3807}
3526 3808
3527sub coord2local { 3809sub coord2local {
3528 my ($self, $x, $y) = @_; 3810 my ($self, $x, $y) = @_;
3529 3811
… …
3614 3896
3615 delete $queue{$widget+0}; 3897 delete $queue{$widget+0};
3616 3898
3617 my ($w, $h) = $widget->size_request; 3899 my ($w, $h) = $widget->size_request;
3618 3900
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3901 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3902 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3903
3904 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3905 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3906
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3907 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3908 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3909
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3910 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3651 3936
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3937 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653 3938
3654 $w = 0 if $w < 0; 3939 $w = 0 if $w < 0;
3655 $h = 0 if $h < 0; 3940 $h = 0 if $h < 0;
3941
3942 $w = max $widget->{min_w}, $w;
3943 $h = max $widget->{min_h}, $h;
3944
3945 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3946 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656 3947
3657 $w = int $w + 0.5; 3948 $w = int $w + 0.5;
3658 $h = int $h + 0.5; 3949 $h = int $h + 0.5;
3659 3950
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3951 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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