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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.339 by root, Sun Jul 30 12:15:19 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 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
89 105
90 $GRAB = $widget; 106 $GRAB = $widget;
91 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
92 108
93 check_tooltip; 109 $TOOLTIP_WATCHER->cb->();
94 } 110 }
95 111
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
97 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
99 if $GRAB; 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
… …
955package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
956 1019
957our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
958 1021
959sub new { 1022sub new {
960 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
961 1026
962 my $self; 1027 my $self;
963 1028
964 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
965 vertical => 1, 1030 vertical => 1,
… …
968 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
969 }, 1034 },
970 ; 1035 ;
971 1036
972 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
974 slider => $slider, 1040 slider => $slider,
975 @_, 1041 %arg,
976 ); 1042 );
977 1043
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
981 1046
982 $self 1047 $self
983} 1048}
984 1049
1050#TODO# update range on size_allocate depending on child
1051
1052sub add {
1053 my ($self, $widget) = @_;
1054
1055 $self->{vp}->add ($self->{child} = $widget);
1056}
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
985sub update { 1074sub update {
986 my ($self) = @_; 1075 my ($self) = @_;
987 1076
988 $self->SUPER::update; 1077 $self->SUPER::update;
989 1078
990 # todo: overwrite size_allocate of child 1079 $self->update_slider;
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1080}
994 1081
995sub size_allocate { 1082sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
997 1084
1085 $self->update_slider;
1086
998 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1088}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1089
1007############################################################################# 1090#############################################################################
1008 1091
1009package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1010 1093
… …
1026 1109
1027 if ($self->{bg}) { 1110 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
1029 1112
1030 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
1033 1116
1034 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1118 glVertex 0 , 0;
1036 glVertex 0 , $h; 1119 glVertex 0 , $h;
1037 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1061 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);
1062 1145
1063sub new { 1146sub new {
1064 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1065 1148
1066 my $title = delete $arg{title};
1067
1068 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1152 border => 0.6,
1072 can_events => 1, 1153 can_events => 1,
1073 min_w => 16, 1154 min_w => 64,
1074 min_h => 16, 1155 min_h => 32,
1075 %arg, 1156 %arg,
1076 ); 1157 );
1077 1158
1078 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1079 align => 0, 1160 align => 0,
1080 valign => 1, 1161 valign => 1,
1081 text => $title, 1162 text => $self->{title},
1082 fontsize => $self->{border} 1163 fontsize => $self->{border},
1083 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 }
1084 1174
1085 $self 1175 $self
1086} 1176}
1087 1177
1088sub add { 1178sub add {
1089 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1090 1180
1091 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1184}
1094 1185
1095sub border { 1186sub border {
1096 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1097} 1188}
1098 1189
1099sub size_request { 1190sub size_request {
1100 my ($self) = @_; 1191 my ($self) = @_;
1101 1192
1102 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1103 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1104 1198
1105 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1106 1200
1107 ( 1201 (
1108 $w + $self->border * 2, 1202 $w + $self->border * 2,
1109 $h + $self->border * 2, 1203 $h + $self->border * 2,
1110 ) 1204 )
1111} 1205}
1112 1206
1113sub size_allocate { 1207sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1115 1209
1116 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1214 }
1121 1215
1122 my $border = $self->border; 1216 my $border = $self->border;
1123 1217
1124 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1125 $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;
1126 1233
1127 $self->child->configure ($border, $border, $w, $h); 1234 1
1128} 1235}
1129 1236
1130sub button_down { 1237sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1132 1239
1133 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1241 my $border = $self->border;
1135 1242
… …
1151 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1152 1259
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1264 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1265 };
1159 1266
1160 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1166 1273
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1275
1169 $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});
1170 }; 1279 };
1171 } else { 1280 } else {
1172 return 0; 1281 return 0;
1173 } 1282 }
1174 1283
1175 1 1284 1
1176} 1285}
1177 1286
1178sub button_up { 1287sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1180 1289
1181 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1182} 1291}
1183 1292
1184sub mouse_motion { 1293sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1186 1295
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1297
1189 !!$self->{motion} 1298 ! ! $self->{motion}
1299}
1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1190} 1307}
1191 1308
1192sub _draw { 1309sub _draw {
1193 my ($self) = @_; 1310 my ($self) = @_;
1194 1311
… …
1220 1337
1221 glDisable GL_TEXTURE_2D; 1338 glDisable GL_TEXTURE_2D;
1222 1339
1223 $child->draw; 1340 $child->draw;
1224 1341
1225 if ($self->{title}) { 1342 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1343 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1344 $self->{title_widget}->_draw;
1345
1346 glTranslate 0, - ($border - $self->{h});
1228 } 1347 }
1348
1349 $self->{close_button}->draw
1350 if $self->{close_button};
1229} 1351}
1230 1352
1231############################################################################# 1353#############################################################################
1232 1354
1233package CFClient::UI::Table; 1355package CFClient::UI::Table;
… …
1250sub children { 1372sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1252} 1374}
1253 1375
1254sub add { 1376sub add {
1255 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1256 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1257 $child->set_parent ($self); 1381 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1259 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1260 $self->realloc; 1387 $self->realloc;
1388}
1389
1390sub remove {
1391 my ($self, $child) = @_;
1392
1393 # TODO: not yet implemented
1261} 1394}
1262 1395
1263# TODO: move to container class maybe? send children a signal on removal? 1396# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1397sub clear {
1265 my ($self) = @_; 1398 my ($self) = @_;
… …
1306 (sum @$ws), 1439 (sum @$ws),
1307 (sum @$hs), 1440 (sum @$hs),
1308 ) 1441 )
1309} 1442}
1310 1443
1311sub size_allocate { 1444sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1313 1446
1314 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1315 1448
1316 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1348 } 1481 }
1349 1482
1350 $y += $row_h; 1483 $y += $row_h;
1351 } 1484 }
1352 1485
1486 1
1353} 1487}
1354 1488
1355sub find_widget { 1489sub find_widget {
1356 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1357 1491
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1530 )
1397} 1531}
1398 1532
1399sub size_allocate { 1533sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1534 my ($self, $w, $h) = @_;
1401 1535
1402 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1404 1538
1405 my @req; 1539 my @req;
1406 1540
1407 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1409 } else { 1543 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1412 1546
1413 if ($req > $space) { 1547 if ($req > $space) {
1414 # ah well, not enough space 1548 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1416 } else { 1550 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1552
1419 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1420 1554
1421 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1556 for 0 .. $#children;
1423 } 1557 }
1424 } 1558 }
1425 1559
1426 CFClient::UI::harmonize \@req; 1560 CFClient::UI::harmonize \@req;
1427 1561
1428 my $pos = 0; 1562 my $pos = 0;
1429 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1566
1433 $pos += $alloc; 1567 $pos += $alloc;
1434 } 1568 }
1435 1569
1436 1 1570 1
… …
1509 } 1643 }
1510 1644
1511 $self 1645 $self
1512} 1646}
1513 1647
1514sub escape($) {
1515 local $_ = $_[0];
1516
1517 s/&/&amp;/g;
1518 s/>/&gt;/g;
1519 s/</&lt;/g;
1520
1521 $_
1522}
1523
1524sub update { 1648sub update {
1525 my ($self) = @_; 1649 my ($self) = @_;
1526 1650
1527 delete $self->{texture}; 1651 delete $self->{texture};
1528 $self->SUPER::update; 1652 $self->SUPER::update;
1529} 1653}
1530 1654
1655sub realloc {
1656 my ($self) = @_;
1657
1658 delete $self->{ox};
1659 $self->SUPER::realloc;
1660}
1661
1531sub set_text { 1662sub set_text {
1532 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1533 1664
1534 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1536 1667
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1539 1669
1670 delete $self->{size_req};
1540 $self->realloc; 1671 $self->realloc;
1541 $self->update; 1672 $self->update;
1542} 1673}
1543 1674
1544sub set_markup { 1675sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1549 1680
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1682
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1554 1684
1685 delete $self->{size_req};
1555 $self->realloc; 1686 $self->realloc;
1556 $self->update; 1687 $self->update;
1557} 1688}
1558 1689
1559sub size_request { 1690sub size_request {
1560 my ($self) = @_; 1691 my ($self) = @_;
1561 1692
1693 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1699
1568 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1569 1701
1570 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1706
1574 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1575 1708
1576 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1711 }
1712
1713 [$w, $h]
1578 } 1714 };
1579 1715
1580 ($w, $h) 1716 @{ $self->{size_req} }
1581} 1717}
1582 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1583sub size_allocate { 1723sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1585 1725
1586 delete $self->{ox}; 1726 delete $self->{ox};
1587 1727
1588 delete $self->{texture} 1728 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1590} 1732}
1591 1733
1592sub set_fontsize { 1734sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1594 1736
1595 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1596 delete $self->{texture}; 1739 delete $self->{texture};
1597 1740
1598 $self->realloc; 1741 $self->realloc;
1599} 1742}
1600 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1601sub _draw { 1753sub _draw {
1602 my ($self) = @_; 1754 my ($self) = @_;
1603 1755
1604 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1605 1757
1606 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1765
1614 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1615 }; 1767 };
1616 1768
1617 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1621 1773
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1777 };
1626 1778
1627 glEnable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1781
1630 if ($tex->{format} == GL_ALPHA) { 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1631 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636
1637 glDisable GL_TEXTURE_2D;
1638} 1783}
1639 1784
1640############################################################################# 1785#############################################################################
1641 1786
1642package CFClient::UI::EntryBase; 1787package CFClient::UI::EntryBase;
… …
1656 can_hover => 1, 1801 can_hover => 1,
1657 can_focus => 1, 1802 can_focus => 1,
1658 valign => 0, 1803 valign => 0,
1659 can_events => 1, 1804 can_events => 1,
1660 #text => ... 1805 #text => ...
1806 #hidden => "*",
1661 @_ 1807 @_
1662 ) 1808 )
1663} 1809}
1664 1810
1665sub _set_text { 1811sub _set_text {
… …
1667 1813
1668 delete $self->{cur_h}; 1814 delete $self->{cur_h};
1669 1815
1670 return if $self->{text} eq $text; 1816 return if $self->{text} eq $text;
1671 1817
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1819 $self->{text} = $text;
1676 1820
1677 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1679 1824
1680 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1828 $self->update;
1681} 1829}
1682 1830
1683sub set_text { 1831sub set_text {
1684 my ($self, $text) = @_; 1832 my ($self, $text) = @_;
1685 1833
1686 $self->{cursor} = length $text; 1834 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1835 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1836}
1691 1837
1692sub get_text { 1838sub get_text {
1693 $_[0]{text} 1839 $_[0]{text}
1694} 1840}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1700 1846
1701 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1702} 1848}
1703 1849
1704sub key_down { 1850sub invoke_key_down {
1705 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1706 1852
1707 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFClient::SDLK_HOME) {
1722 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1872 $self->emit ('escape');
1727 } elsif ($uni) { 1873 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1875 } else {
1730 return 0; 1876 return 0;
1731 } 1877 }
… …
1735 $self->realloc; 1881 $self->realloc;
1736 1882
1737 1 1883 1
1738} 1884}
1739 1885
1740sub focus_in { 1886sub invoke_focus_in {
1741 my ($self) = @_; 1887 my ($self) = @_;
1742 1888
1743 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1744 1890
1745 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1746} 1892}
1747 1893
1748sub button_down { 1894sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1750 1896
1751 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1898
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1900
1755 # byte-index to char-index 1901 # byte-index to char-index
1756 my $text = $self->{text}; 1902 my $text = $self->{text};
1757 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1759 1905
1760 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1761 $self->update; 1907 $self->update;
1762 1908
1763 1 1909 1
1764} 1910}
1765 1911
1766sub mouse_motion { 1912sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 1915
1770 0 1916 1
1771} 1917}
1772 1918
1773sub _draw { 1919sub _draw {
1774 my ($self) = @_; 1920 my ($self) = @_;
1775 1921
1776 local $self->{fg} = $self->{fg}; 1922 local $self->{fg} = $self->{fg};
1777 1923
1778 if ($FOCUS == $self) { 1924 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1925 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1926 $self->{fg} = $self->{active_fg};
1781 } else { 1927 } else {
1782 glColor @{$self->{bg}}; 1928 glColor_premultiply @{$self->{bg}};
1783 } 1929 }
1784 1930
1785 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1933 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1934 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1935 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1936 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1937 glVertex $self->{w}, 0;
… …
1816 1962
1817our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFClient::UI::EntryBase::;
1818 1964
1819use CFClient::OpenGL; 1965use CFClient::OpenGL;
1820 1966
1821sub key_down { 1967sub invoke_key_down {
1822 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1823 1969
1824 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1825 1971
1826 if ($sym == 13) { 1972 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1829 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1832 $self->update; 1979 $self->update;
1833 1980
1834 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFClient::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
… …
1852 } else { 1999 } else {
1853 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1854 } 2001 }
1855 2002
1856 } else { 2003 } else {
1857 return $self->SUPER::key_down ($ev) 2004 return $self->SUPER::invoke_key_down ($ev)
1858 } 2005 }
1859 2006
1860 1 2007 1
1861} 2008}
1862 2009
… …
1886 can_events => 1, 2033 can_events => 1,
1887 @_ 2034 @_
1888 ) 2035 )
1889} 2036}
1890 2037
1891sub activate { }
1892
1893sub button_up { 2038sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1895 2040
1896 $self->emit ("activate") 2041 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
… …
1901} 2046}
1902 2047
1903sub _draw { 2048sub _draw {
1904 my ($self) = @_; 2049 my ($self) = @_;
1905 2050
1906 local $self->{fg} = $self->{fg}; 2051 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 2052
1912 glEnable GL_TEXTURE_2D; 2053 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2055 glColor 0, 0, 0, 1;
1915 2056
… …
1952 my ($self) = @_; 2093 my ($self) = @_;
1953 2094
1954 (6) x 2 2095 (6) x 2
1955} 2096}
1956 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1957sub button_down { 2106sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1959 2108
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2111 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2112 } else {
1965 return 0 2113 return 0
1966 } 2114 }
1967 2115
1968 1 2116 1
… …
1993package CFClient::UI::Image; 2141package CFClient::UI::Image;
1994 2142
1995our @ISA = CFClient::UI::Base::; 2143our @ISA = CFClient::UI::Base::;
1996 2144
1997use CFClient::OpenGL; 2145use CFClient::OpenGL;
1998use Carp qw/confess/;
1999 2146
2000our %loaded_images; 2147our %texture_cache;
2001 2148
2002sub new { 2149sub new {
2003 my $class = shift; 2150 my $class = shift;
2004 2151
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2006 2156
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
2008 2159
2009 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2011 2162
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2164
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2166
2018 $self 2167 $self
2019} 2168}
2020 2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
2021sub size_request { 2185sub size_request {
2022 my ($self) = @_; 2186 my ($self) = @_;
2023 2187
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
2025} 2189}
2026 2190
2027sub _draw { 2191sub _draw {
2028 my ($self) = @_; 2192 my ($self) = @_;
2029 2193
… …
2039 } 2203 }
2040 2204
2041 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2207
2044 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
2045 2209
2046 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
2211}
2212
2213#############################################################################
2214
2215package CFClient::UI::ImageButton;
2216
2217our @ISA = CFClient::UI::Image::;
2218
2219use CFClient::OpenGL;
2220
2221my %textures;
2222
2223sub new {
2224 my $class = shift;
2225
2226 my $self = $class->SUPER::new (
2227 padding_x => 4,
2228 padding_y => 4,
2229 fg => [1, 1, 1],
2230 active_fg => [0, 0, 1],
2231 can_hover => 1,
2232 align => 0,
2233 valign => 0,
2234 can_events => 1,
2235 @_
2236 );
2237}
2238
2239sub invoke_button_up {
2240 my ($self, $ev, $x, $y) = @_;
2241
2242 $self->emit ("activate")
2243 if $x >= 0 && $x < $self->{w}
2244 && $y >= 0 && $y < $self->{h};
2245
2246 1
2047} 2247}
2048 2248
2049############################################################################# 2249#############################################################################
2050 2250
2051package CFClient::UI::VGauge; 2251package CFClient::UI::VGauge;
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2340
2141 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2342 my $h2 = $self->{h} * (1 - $ycut2);
2343 my $h3 = $self->{h};
2344
2345 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2346
2144 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2352
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2353 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2354 glBegin GL_QUADS;
… …
2165 2369
2166 if ($t3) { 2370 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2377 glEnd;
2174 } 2378 }
2175 2379
2176 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
… …
2264 $self->update; 2468 $self->update;
2265 2469
2266 $self 2470 $self
2267} 2471}
2268 2472
2269sub changed { }
2270
2271sub set_range { 2473sub set_range {
2272 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2273 2475
2274 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2275 2477
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2278} 2482}
2279 2483
2280sub set_value { 2484sub set_value {
2281 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2282 2486
… …
2293 if $unit; 2497 if $unit;
2294 2498
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2500
2297 if ($value != $old_value) { 2501 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2299 $self->update; 2503 $self->update;
2300 } 2504 }
2301} 2505}
2302 2506
2303sub size_request { 2507sub size_request {
2304 my ($self) = @_; 2508 my ($self) = @_;
2305 2509
2306 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2307} 2511}
2308 2512
2309sub button_down { 2513sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2311 2515
2312 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2517
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2519
2316 $self->mouse_motion ($ev, $x, $y) 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2521}
2318 2522
2319sub mouse_motion { 2523sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2321 2525
2322 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2528
… …
2332 } 2536 }
2333 2537
2334 1 2538 1
2335} 2539}
2336 2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2549}
2550
2337sub update { 2551sub update {
2338 my ($self) = @_; 2552 my ($self) = @_;
2339 2553
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2554 delete $self->{knob_w};
2555 $self->SUPER::update;
2556}
2557
2558sub _draw {
2559 my ($self) = @_;
2560
2561 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2562 $self->set_value ($self->{range}[0]);
2342 2563
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2564 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2565 my $range = ($hi - $page - $lo) || 1e-100;
2345 2566
… …
2351 $value = ($value - $lo) / $range; 2572 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2573 $value = $value * $self->{scale} + $self->{offset};
2353 2574
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2575 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2576 $self->{knob_w} = $knob_w;
2356 }); 2577 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2578
2364 $self->SUPER::_draw (); 2579 $self->SUPER::_draw ();
2365 2580
2366 glScale $self->{w}, $self->{h}; 2581 glScale $self->{w}, $self->{h};
2367 2582
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2430 2645
2431############################################################################# 2646#############################################################################
2432 2647
2433package CFClient::UI::TextView; 2648package CFClient::UI::TextScroller;
2434 2649
2435our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFClient::UI::HBox::;
2436 2651
2437use CFClient::OpenGL; 2652use CFClient::OpenGL;
2438 2653
2439sub new { 2654sub new {
2440 my $class = shift; 2655 my $class = shift;
2441 2656
2442 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2443 fontsize => 1, 2658 fontsize => 1,
2444 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2445 #font => default_font 2661 #font => default_font
2446 @_, 2662 @_,
2447 2663
2448 layout => (new CFClient::Layout 1), 2664 layout => (new CFClient::Layout),
2449 par => [], 2665 par => [],
2450 height => 0, 2666 height => 0,
2451 children => [ 2667 children => [
2452 (new CFClient::UI::Empty expand => 1), 2668 (new CFClient::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2669 (new CFClient::UI::Slider vertical => 1),
… …
2464 2680
2465 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2682 $self->reflow;
2467} 2683}
2468 2684
2685sub size_request {
2686 my ($self) = @_;
2687
2688 my ($empty, $slider) = @{ $self->{children} };
2689
2690 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request
2692}
2693
2469sub size_allocate { 2694sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2471 2696
2472 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2699
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2702 $self->{layout}->set_width ($empty->{w});
2703 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2704
2478 $self->reflow; 2705 $self->reflow;
2479}
2480 2706
2481sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2482 my ($self, $text, $indent) = @_; 2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2719}
2720
2721sub get_layout {
2722 my ($self, $para) = @_;
2483 2723
2484 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2485 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2729 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2730 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2731 $layout->set_markup ($para->{markup});
2732
2733 $layout->set_shapes (
2734 map
2735 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2736 @{$para->{widget}}
2489 2737 );
2738
2490 $layout->size 2739 $layout
2491} 2740}
2492 2741
2493sub reflow { 2742sub reflow {
2494 my ($self) = @_; 2743 my ($self) = @_;
2495 2744
… …
2504 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2505} 2754}
2506 2755
2507sub clear { 2756sub clear {
2508 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2509 2761
2510 $self->{par} = []; 2762 $self->{par} = [];
2511 $self->{height} = 0; 2763 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2765}
2514 2766
2515sub add_paragraph { 2767sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2517 2769
2518 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2519 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2520 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2522 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2523 2780
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para;
2783 }
2784
2785 $self->{need_reflow}++;
2786 $self->update;
2787}
2788
2789sub scroll_to_bottom {
2790 my ($self) = @_;
2791
2792 $self->{scroll_to_bottom} = 1;
2793 $self->update;
2525} 2794}
2526 2795
2527sub update { 2796sub update {
2528 my ($self) = @_; 2797 my ($self) = @_;
2529 2798
… …
2531 2800
2532 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2533 2802
2534 delete $self->{texture}; 2803 delete $self->{texture};
2535 2804
2536 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2807
2539 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2809 my $height = 0;
2541 2810
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2815
2552 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2553 } 2819 }
2554 2820
2555 $height += $_->[1]; 2821 $height += $para->{h};
2556 } 2822 }
2557 2823
2558 $self->{height} = $height; 2824 $self->{height} = $height;
2559 2825
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2827
2562 delete $self->{texture}; 2828 delete $self->{texture};
2563 } 2829 }
2564 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2836 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2568 2838
2569 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2570 2840
2571 my $y0 = $top; 2841 my $y0 = $top;
2572 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2573 2843
2574 my $y = 0; 2844 my $y = 0;
2575 2845
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2584 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2847 my $h = $para->{h};
2586 2848
2587 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 2850
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2593 2852
2594 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2854
2855 if (my @w = @{ $para->{widget} }) {
2856 my @s = $layout->get_shapes;
2857
2858 for (@w) {
2859 my ($dx, $dy) = splice @s, 0, 2, ();
2860
2861 $_->{x} = $dx + $para->{indent};
2862 $_->{y} = $dy + $y - $y0;
2863
2864 $_->draw;
2865 }
2866 }
2596 } 2867 }
2597 2868
2598 $y += $h; 2869 $y += $h;
2599 } 2870 }
2600
2601 glDisable GL_BLEND;
2602 }; 2871 };
2603 }); 2872 });
2604} 2873}
2605 2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2882}
2883
2606sub _draw { 2884sub _draw {
2607 my ($self) = @_; 2885 my ($self) = @_;
2608 2886
2609 glEnable GL_TEXTURE_2D; 2887 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2888 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2889 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2890 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2614 2892
2615 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2616
2617} 2894}
2618 2895
2619############################################################################# 2896#############################################################################
2620 2897
2621package CFClient::UI::Animator; 2898package CFClient::UI::Animator;
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2985 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2987 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2988 . "visible $widget->{visible}";
2712 } 2989 }
2990
2991 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//;
2713 2993
2714 $self->add (new CFClient::UI::Label 2994 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2995 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2997 fontsize => 0.8,
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 3008
2729 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2730} 3010}
2731 3011
2732sub size_allocate { 3012sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2734 3014
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 3016}
2737 3017
2738sub visibility_change { 3018sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2740 3020
2741 return unless $visible; 3021 return unless $visible;
2742 3022
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2745 or return; 3025 or return;
2746 3026
3027 if ($widget->{visible}) {
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 3029
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 3031 if $x + $self->{w} > $self->{root}{w};
2751 3032
2752 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2753 }); 3037 });
2754} 3038}
2755 3039
2756sub _draw { 3040sub _draw {
2757 my ($self) = @_; 3041 my ($self) = @_;
… …
2783 3067
2784############################################################################# 3068#############################################################################
2785 3069
2786package CFClient::UI::Face; 3070package CFClient::UI::Face;
2787 3071
2788our @ISA = CFClient::UI::Base::; 3072our @ISA = CFClient::UI::DrawBG::;
2789 3073
2790use CFClient::OpenGL; 3074use CFClient::OpenGL;
2791 3075
2792sub new { 3076sub new {
2793 my $class = shift; 3077 my $class = shift;
… …
2830sub _draw { 3114sub _draw {
2831 my ($self) = @_; 3115 my ($self) = @_;
2832 3116
2833 return unless $::CONN; 3117 return unless $::CONN;
2834 3118
3119 $self->SUPER::_draw;
3120
2835 my $face; 3121 my $face;
2836 3122
2837 if ($self->{frame}) { 3123 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2839 3125
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3131
2846 if ($tex) { 3132 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3133 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3135 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2852 } 3138 }
2853} 3139}
2854 3140
2855sub DESTROY { 3141sub destroy {
2856 my ($self) = @_; 3142 my ($self) = @_;
2857 3143
2858 $self->{timer}->cancel 3144 $self->{timer}->cancel
2859 if $self->{timer}; 3145 if $self->{timer};
2860 3146
2861 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2862} 3148}
2863 3149
2864############################################################################# 3150#############################################################################
2865 3151
2866package CFClient::UI::Buttonbar; 3152package CFClient::UI::Buttonbar;
… …
2887 ); 3173 );
2888 3174
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 3176
2891 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2893 3179
2894 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2895 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
3185 $widget = new CFClient::UI::HBox
3186 can_hover => 1,
3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
2896 $widget = new CFClient::UI::Label 3196 $widget = new CFClient::UI::Label
2897 can_hover => 1, 3197 can_hover => 1,
2898 can_events => 1, 3198 can_events => 1,
2899 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2900 } 3202 }
2901 3203
2902 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2903 3205
2904 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2909 3211
2910# popup given the event (must be a mouse button down event currently) 3212# popup given the event (must be a mouse button down event currently)
2911sub popup { 3213sub popup {
2912 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2913 3215
2914 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2915 3217
2916 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3219 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2919 3221
2920 $self->show; 3222 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3223 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3224}
2923 3225
2924sub mouse_motion { 3226sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2926 3228
2927 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2930 3232
2931 0 3233 0
2932} 3234}
2933 3235
2934sub button_up { 3236sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2936 3238
2937 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3240 undef $GRAB;
2939 $self->hide; 3241 $self->hide;
2940 3242
2941 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3245 } else {
2944 return 0 3246 return 0
2945 } 3247 }
2946 3248
… …
2973 3275
2974 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3277 if @{ $self->{children} };
2976} 3278}
2977 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
2978sub set_current_page { 3286sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
2980 3288
2981 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3290 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3291 : $self->{children}[$page_or_widget];
2984 3292
2985 $self->{current} = $widget; 3293 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3295
2988 $self->_emit (page_changed => $self->{current}); 3296 $self->emit (page_changed => $self->{current});
2989 3297
2990 $self->realloc; 3298 $self->realloc;
2991} 3299}
2992 3300
2993sub visible_children { 3301sub visible_children {
… …
2998 my ($self) = @_; 3306 my ($self) = @_;
2999 3307
3000 $self->{current}->size_request 3308 $self->{current}->size_request
3001} 3309}
3002 3310
3003sub size_allocate { 3311sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3312 my ($self, $w, $h) = @_;
3005 3313
3006 $self->{current}->configure (0, 0, $w, $h); 3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3007} 3317}
3008 3318
3009sub _draw { 3319sub _draw {
3010 my ($self) = @_; 3320 my ($self) = @_;
3011 3321
… …
3022 my $class = shift; 3332 my $class = shift;
3023 3333
3024 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3335 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3336 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3337 # filter => # will be put between multiplexer and $self
3027 @_, 3338 @_,
3028 ); 3339 );
3029 3340
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3342 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3343
3032 $self 3344 $self
3033} 3345}
3034 3346
3035sub add { 3347sub add {
… …
3044 ); 3356 );
3045 3357
3046 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3047} 3359}
3048 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3049sub set_current_page { 3367sub set_current_page {
3050 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3051 3369
3052 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3372}
3055 3373
3056############################################################################# 3374#############################################################################
3057 3375
3058package CFClient::UI::Statusbox; 3376package CFClient::UI::Selector;
3059 3377
3378use utf8;
3379
3060our @ISA = CFClient::UI::VBox::; 3380our @ISA = CFClient::UI::Button::;
3061 3381
3062sub new { 3382sub new {
3063 my $class = shift; 3383 my $class = shift;
3064 3384
3065 $class->SUPER::new ( 3385 my $self = $class->SUPER::new (
3386 options => [], # [value, title, longdesc], ...
3387 value => undef,
3388 @_,
3389 );
3390
3391 $self->_set_value ($self->{value});
3392
3393 $self
3394}
3395
3396sub invoke_button_down {
3397 my ($self, $ev) = @_;
3398
3399 my @menu_items;
3400
3401 for (@{ $self->{options} }) {
3402 my ($value, $title, $tooltip) = @$_;
3403
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 }
3406
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408}
3409
3410sub _set_value {
3411 my ($self, $value) = @_;
3412
3413 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3414 or return;
3415
3416 $self->{value} = $item->[0];
3417 $self->set_markup ("$item->[1] ⇓");
3418 $self->set_tooltip ($item->[2]);
3419}
3420
3421sub set_value {
3422 my ($self, $value) = @_;
3423
3424 return unless $self->{value} ne $value;
3425
3426 $self->_set_value ($value);
3427 $self->emit (changed => $value);
3428}
3429
3430#############################################################################
3431
3432package CFClient::UI::Statusbox;
3433
3434our @ISA = CFClient::UI::VBox::;
3435
3436sub new {
3437 my $class = shift;
3438
3439 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3440 fontsize => 0.8,
3067 @_, 3441 @_,
3068 ) 3442 );
3443
3444 Scalar::Util::weaken (my $this = $self);
3445
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447
3448 $self
3069} 3449}
3070 3450
3071sub reorder { 3451sub reorder {
3072 my ($self) = @_; 3452 my ($self) = @_;
3073 my $NOW = time; 3453 my $NOW = Time::HiRes::time;
3454
3455 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} };
3074 3459
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3462 }
3078 3463
… …
3081 my @items = sort { 3466 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3467 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3468 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3469 } values %{ $self->{item} };
3085 3470
3471 $self->{timer}->interval (1);
3472
3086 my $count = 10 + 1; 3473 my $count = 10 + 1;
3087 for my $item (@items) { 3474 for my $item (@items) {
3088 last unless --$count; 3475 last unless --$count;
3089 3476
3090 push @widgets, $item->{label} ||= do { 3477 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3478 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3479 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3480 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3481 : $item->{text};
3095 3482
… …
3103 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3494 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3495 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3496 can_events => 1,
3110 can_hover => 1 3497 can_hover => 1
3111 }; 3498 };
3499
3500 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3501 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3502 $label->update;
3503 $label->set_max_size (undef, $label->{req_h} * $diff)
3504 if $diff < 1;
3505 $self->{timer}->interval (1/30);
3506 } else {
3507 $label->{fg}[3] = $item->{fg}[3] || 1;
3508 }
3509
3510 push @widgets, $label;
3112 } 3511 }
3113 3512
3114 $self->clear; 3513 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3514 $self->SUPER::add (reverse @widgets);
3116} 3515}
… …
3121 $text =~ s/^\s+//; 3520 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3521 $text =~ s/\s+$//;
3123 3522
3124 return unless $text; 3523 return unless $text;
3125 3524
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3525 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3526
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3527 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3528
3130 if (my $item = $self->{item}{$group}) { 3529 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3530 if ($item->{text} eq $text) {
3132 $item->{count}++; 3531 $item->{count}++;
3133 } else { 3532 } else {
3134 $item->{count} = 1; 3533 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
3136 } 3535 }
3137 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3538 delete $item->{label};
3140 } else { 3539 } else {
3141 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
3148 count => 1, 3547 count => 1,
3149 %arg, 3548 %arg,
3150 }; 3549 };
3151 } 3550 }
3152 3551
3552 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3553 $self->reorder;
3554 });
3154} 3555}
3155 3556
3156sub reconfigure { 3557sub reconfigure {
3157 my ($self) = @_; 3558 my ($self) = @_;
3158 3559
… …
3161 3562
3162 $self->reorder; 3563 $self->reorder;
3163 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
3164} 3565}
3165 3566
3567sub destroy {
3568 my ($self) = @_;
3569
3570 $self->{timer}->cancel;
3571
3572 $self->SUPER::destroy;
3573}
3574
3166############################################################################# 3575#############################################################################
3167 3576
3168package CFClient::UI::Inventory; 3577package CFClient::UI::Inventory;
3169 3578
3170our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFClient::UI::Table::;
3171 3580
3172sub new { 3581sub new {
3173 my $class = shift; 3582 my $class = shift;
3174 3583
3175 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3177 @_, 3587 @_,
3178 ); 3588 );
3179 3589
3590 $self->set_sort_order (undef);
3591
3180 $self 3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3181} 3628}
3182 3629
3183sub set_items { 3630sub set_items {
3184 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3185 3632
3186 $self->{scrolled}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3187 return unless $items; 3634 $self->update_items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206} 3635}
3207 3636
3208############################################################################# 3637#############################################################################
3209 3638
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList; 3639package CFClient::UI::SpellList;
3408 3640
3409our @ISA = CFClient::UI::ScrolledWindow::; 3641our @ISA = CFClient::UI::Table::;
3410 3642
3411sub new { 3643sub new {
3412 my $class = shift; 3644 my $class = shift;
3413 3645
3414 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
3415 binding => [], 3647 binding => [],
3416 commands => [], 3648 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3649 @_,
3419 ) 3650 )
3420} 3651}
3421 3652
3422# XXX: Do sorting? Argl... 3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFClient::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFClient::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFClient::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFClient::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3423sub add_spell { 3738sub add_spell {
3424 my ($self, $spell) = @_; 3739 my ($self, $spell) = @_;
3740
3425 $self->{spells}->{$spell->{name}} = $spell; 3741 $self->{spell}->{$spell->{name}} = $spell;
3426 3742 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3743}
3455 3744
3456sub remove_spell { 3745sub remove_spell {
3457 my ($self, $spell) = @_; 3746 my ($self, $spell) = @_;
3747
3458 delete $self->{spells}->{$spell->{name}}; 3748 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3749 $self->rebuild_spell_list;
3460} 3750}
3461 3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3462############################################################################# 3759#############################################################################
3463 3760
3464package CFClient::UI::Root; 3761package CFClient::UI::Root;
3465 3762
3466our @ISA = CFClient::UI::Container::; 3763our @ISA = CFClient::UI::Container::;
3764
3765use List::Util qw(min max);
3467 3766
3468use CFClient::OpenGL; 3767use CFClient::OpenGL;
3469 3768
3470sub new { 3769sub new {
3471 my $class = shift; 3770 my $class = shift;
… …
3498 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3499 3798
3500 int $coord + 0.5 3799 int $coord + 0.5
3501} 3800}
3502 3801
3503sub size_allocate { 3802sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3505 3804
3506 for my $child ($self->children) { 3805 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3806 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3807
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3514 3813
3515 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3516 } 3815 }
3816
3817 1
3517} 3818}
3518 3819
3519sub coord2local { 3820sub coord2local {
3520 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3521 3822
… …
3606 3907
3607 delete $queue{$widget+0}; 3908 delete $queue{$widget+0};
3608 3909
3609 my ($w, $h) = $widget->size_request; 3910 my ($w, $h) = $widget->size_request;
3610 3911
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3912 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3913 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3914
3915 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3916 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3917
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3918 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3919 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3920
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3921 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 3947
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 3949
3646 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3952
3953 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h;
3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 3961
3649 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3651 3964
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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