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.269 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
88 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
89 103
90 $GRAB = $widget; 104 $GRAB = $widget;
91 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
92 106
93 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
94 } 108 }
95 109
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 111
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
99 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
188 203
189 } 204 }
190 } 205 }
191 206
192 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
193} 216}
194 217
195############################################################################# 218#############################################################################
196 219
197package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $self->{x} = List::Util::max 0, int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
338} 360}
339 361
362sub baseline_shift {
363 0
364}
365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
343 if ($self->{aspect}) { 369 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
345 371
346 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
348 374
349 # use alignment to adjust x, y 375 # use alignment to adjust x, y
350 376
351 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
366 392
367 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
368 } 394 }
369} 395}
370 396
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
376} 403}
377 404
378sub set_max_size { 405sub set_max_size {
379 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
380 407
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
383} 412}
384 413
385sub set_tooltip { 414sub set_tooltip {
386 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
387 416
… …
392 421
393 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
394 423
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 427 }
399} 428}
400 429
401# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
402sub coord2local { 431sub coord2local {
403 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
404 433
434 Carp::confess unless $self->{parent};#d#
435
405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
406} 437}
407 438
408# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
409sub coord2global { 440sub coord2global {
410 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
411 442
443 Carp::confess unless $self->{parent};#d#
444
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 446}
414 447
415sub focus_in { 448sub invoke_focus_in {
416 my ($self) = @_; 449 my ($self) = @_;
417 450
418 return if $FOCUS == $self; 451 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
420 453
421 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
422 455
423 $self->_emit (focus_in => $focus); 456 $self->update;
424 457
425 $focus->update if $focus; 458 0
426 $FOCUS->update;
427} 459}
428 460
429sub focus_out { 461sub invoke_focus_out {
430 my ($self) = @_; 462 my ($self) = @_;
431 463
432 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
433 465
434 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
435 467
436 $self->_emit (focus_out => $focus); 468 $self->update;
437 469
438 $focus->update if $focus; #?
439
440 $::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
441 unless $FOCUS; 471 unless $FOCUS;
442}
443 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
444sub mouse_motion { } 483sub invoke_mouse_motion { 0 }
445sub button_up { } 484sub invoke_button_up { 0 }
446sub key_down { } 485sub invoke_key_down { 0 }
447sub key_up { } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
448 488
449sub button_down { 489sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
451 491
452 $self->focus_in; 492 $self->grab_focus;
493
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
453} 531}
454 532
455sub find_widget { 533sub find_widget {
456 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
457 535
… …
467sub set_parent { 545sub set_parent {
468 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
469 547
470 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 550}
496 551
497sub realloc { 552sub realloc {
498 my ($self) = @_; 553 my ($self) = @_;
499 554
… …
532 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
533 588
534 # update screen rectangle 589 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539 592
540 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 596
544 glPushMatrix; 597 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 599
549 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 602 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 604 glBegin GL_QUADS;
556 glVertex $x , $y; 605 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
560 glEnd; 609 glEnd;
561 glDisable GL_BLEND; 610 glDisable GL_BLEND;
562 } 611 }
563 612
564 if ($ENV{CFPLUS_DEBUG} & 1) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 614 glPushMatrix;
566 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 618 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
573 glEnd; 622 glEnd;
574 glPopMatrix; 623 glPopMatrix;
575 #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;
576 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
577} 629}
578 630
579sub _draw { 631sub _draw {
580 my ($self) = @_; 632 my ($self) = @_;
581 633
… …
583} 635}
584 636
585sub DESTROY { 637sub DESTROY {
586 my ($self) = @_; 638 my ($self) = @_;
587 639
640 return if CFClient::in_destruct;
641
588 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
589 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590} 646}
591 647
592############################################################################# 648#############################################################################
593 649
594package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
619 675
620 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
622 678
623 glEnable GL_BLEND; 679 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 681 glColor_premultiply @$color;
626 682
627 glBegin GL_QUADS; 683 glBegin GL_QUADS;
628 glVertex 0 , 0; 684 glVertex 0 , 0;
629 glVertex 0 , $h; 685 glVertex 0 , $h;
630 glVertex $w, $h; 686 glVertex $w, $h;
… …
661our @ISA = CFClient::UI::Base::; 717our @ISA = CFClient::UI::Base::;
662 718
663sub new { 719sub new {
664 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
665 721
666 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
667 723
668 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
669 children => [], 725 children => [],
670 can_events => 0, 726 can_events => 0,
671 %arg, 727 %arg,
672 ); 728 );
729
673 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
674 732
675 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
676} 742}
677 743
678sub add { 744sub add {
679 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
680 746
… …
726 $x -= $self->{x}; 792 $x -= $self->{x};
727 $y -= $self->{y}; 793 $y -= $self->{y};
728 794
729 my $res; 795 my $res;
730 796
731 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
733 and return $res; 799 and return $res;
734 } 800 }
735 801
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757} 823}
758 824
759sub add { 825sub add {
760 my ($self, $child) = @_; 826 my ($self, $child) = @_;
761 827
762 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
763
764 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
765} 830}
766 831
767sub remove { 832sub remove {
768 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
777 842
778sub size_request { 843sub size_request {
779 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
780} 845}
781 846
782sub size_allocate { 847sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
784 849
785 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
786} 853}
787 854
788############################################################################# 855#############################################################################
856
857# back-buffered drawing area
789 858
790package CFClient::UI::Window; 859package CFClient::UI::Window;
791 860
792our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
793 862
… …
804 873
805 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
806 $self->SUPER::update; 875 $self->SUPER::update;
807} 876}
808 877
809sub size_allocate { 878sub invoke_size_allocate {
810 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
811 880
812 $self->SUPER::size_allocate ($w, $h);
813 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
814} 884}
815 885
816sub _render { 886sub _render {
817 my ($self) = @_; 887 my ($self) = @_;
818 888
… …
845 my $tex = $self->{texture} 915 my $tex = $self->{texture}
846 or return; 916 or return;
847 917
848 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
851 921
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 923
854 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
855} 925}
… …
879 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
880 950
881 ($w, $h) 951 ($w, $h)
882} 952}
883 953
884sub size_allocate { 954sub invoke_size_allocate {
885 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
886 956
887 my $child = $self->child; 957 my $child = $self->child;
888 958
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891 961
892 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
893 $self->update; 963 $self->update;
964
965 1
894} 966}
895 967
896sub set_offset { 968sub set_offset {
897 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
898 970
… …
946package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
947 1019
948our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
949 1021
950sub new { 1022sub new {
951 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
952 1026
953 my $self; 1027 my $self;
954 1028
955 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
956 vertical => 1, 1030 vertical => 1,
… …
959 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
960 }, 1034 },
961 ; 1035 ;
962 1036
963 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
965 slider => $slider, 1040 slider => $slider,
966 @_, 1041 %arg,
967 ); 1042 );
968 1043
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
972 1046
973 $self 1047 $self
974} 1048}
975 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
976sub update { 1074sub update {
977 my ($self) = @_; 1075 my ($self) = @_;
978 1076
979 $self->SUPER::update; 1077 $self->SUPER::update;
980 1078
981 # todo: overwrite size_allocate of child 1079 $self->update_slider;
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984} 1080}
985 1081
986sub size_allocate { 1082sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
988 1084
1085 $self->update_slider;
1086
989 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1088}
994
995#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll
997 1089
998############################################################################# 1090#############################################################################
999 1091
1000package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1001 1093
… …
1017 1109
1018 if ($self->{bg}) { 1110 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
1020 1112
1021 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
1024 1116
1025 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1118 glVertex 0 , 0;
1027 glVertex 0 , $h; 1119 glVertex 0 , $h;
1028 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1052 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);
1053 1145
1054sub new { 1146sub new {
1055 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1056 1148
1057 my $title = delete $arg{title};
1058
1059 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1152 border => 0.6,
1063 can_events => 1, 1153 can_events => 1,
1064 min_w => 16, 1154 min_w => 64,
1065 min_h => 16, 1155 min_h => 32,
1066 %arg, 1156 %arg,
1067 ); 1157 );
1068 1158
1069 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1070 align => 0, 1160 align => 0,
1071 valign => 1, 1161 valign => 1,
1072 text => $title, 1162 text => $self->{title},
1073 fontsize => $self->{border} 1163 fontsize => $self->{border},
1074 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 }
1075 1174
1076 $self 1175 $self
1077} 1176}
1078 1177
1079sub add { 1178sub add {
1080 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1081 1180
1082 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1184}
1085 1185
1086sub border { 1186sub border {
1087 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1088} 1188}
1089 1189
1090sub size_request { 1190sub size_request {
1091 my ($self) = @_; 1191 my ($self) = @_;
1092 1192
1093 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1094 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1095 1198
1096 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1097 1200
1098 ( 1201 (
1099 $w + $self->border * 2, 1202 $w + $self->border * 2,
1100 $h + $self->border * 2, 1203 $h + $self->border * 2,
1101 ) 1204 )
1102} 1205}
1103 1206
1104sub size_allocate { 1207sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1106 1209
1107 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1214 }
1112 1215
1113 my $border = $self->border; 1216 my $border = $self->border;
1114 1217
1115 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1116 $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;
1117 1233
1118 $self->child->configure ($border, $border, $w, $h); 1234 1
1119} 1235}
1120 1236
1121sub button_down { 1237sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1123 1239
1124 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1241 my $border = $self->border;
1126 1242
… …
1142 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1143 1259
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1264 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1265 };
1150 1266
1151 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1157 1273
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1275
1160 $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});
1161 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1162 } 1284 1
1163} 1285}
1164 1286
1165sub button_up { 1287sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1167 1289
1168 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1169} 1291}
1170 1292
1171sub mouse_motion { 1293sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1173 1295
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1175} 1299}
1176 1300
1177sub _draw { 1301sub _draw {
1178 my ($self) = @_; 1302 my ($self) = @_;
1179 1303
… …
1205 1329
1206 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1207 1331
1208 $child->draw; 1332 $child->draw;
1209 1333
1210 if ($self->{title}) { 1334 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1335 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1213 } 1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1214} 1343}
1215 1344
1216############################################################################# 1345#############################################################################
1217 1346
1218package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1235sub children { 1364sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1237} 1366}
1238 1367
1239sub add { 1368sub add {
1240 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1241 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1242 $child->set_parent ($self); 1373 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1244 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1245 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1246} 1386}
1247 1387
1248# TODO: move to container class maybe? send children a signal on removal? 1388# TODO: move to container class maybe? send children a signal on removal?
1249sub clear { 1389sub clear {
1250 my ($self) = @_; 1390 my ($self) = @_;
… …
1291 (sum @$ws), 1431 (sum @$ws),
1292 (sum @$hs), 1432 (sum @$hs),
1293 ) 1433 )
1294} 1434}
1295 1435
1296sub size_allocate { 1436sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1298 1438
1299 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1300 1440
1301 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1333 } 1473 }
1334 1474
1335 $y += $row_h; 1475 $y += $row_h;
1336 } 1476 }
1337 1477
1478 1
1338} 1479}
1339 1480
1340sub find_widget { 1481sub find_widget {
1341 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1342 1483
… …
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 ) 1522 )
1382} 1523}
1383 1524
1384sub size_allocate { 1525sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1386 1527
1387 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1389 1530
1390 my @req; 1531 my @req;
1391 1532
1392 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1394 } else { 1535 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1397 1538
1398 if ($req > $space) { 1539 if ($req > $space) {
1399 # ah well, not enough space 1540 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1401 } else { 1542 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1544
1404 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1405 1546
1406 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1548 for 0 .. $#children;
1408 } 1549 }
1409 } 1550 }
1410 1551
1411 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1412 1553
1413 my $pos = 0; 1554 my $pos = 0;
1414 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1417 1558
1418 $pos += $alloc; 1559 $pos += $alloc;
1419 } 1560 }
1420 1561
1421 1 1562 1
… …
1494 } 1635 }
1495 1636
1496 $self 1637 $self
1497} 1638}
1498 1639
1499sub escape($) {
1500 local $_ = $_[0];
1501
1502 s/&/&amp;/g;
1503 s/>/&gt;/g;
1504 s/</&lt;/g;
1505
1506 $_
1507}
1508
1509sub update { 1640sub update {
1510 my ($self) = @_; 1641 my ($self) = @_;
1511 1642
1512 delete $self->{texture}; 1643 delete $self->{texture};
1513 $self->SUPER::update; 1644 $self->SUPER::update;
1514} 1645}
1515 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1516sub set_text { 1654sub set_text {
1517 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1518 1656
1519 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1521 1659
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1524 1661
1662 delete $self->{size_req};
1525 $self->realloc; 1663 $self->realloc;
1526 $self->update; 1664 $self->update;
1527} 1665}
1528 1666
1529sub set_markup { 1667sub set_markup {
… …
1532 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1533 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1534 1672
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1674
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1539 1676
1677 delete $self->{size_req};
1540 $self->realloc; 1678 $self->realloc;
1541 $self->update; 1679 $self->update;
1542} 1680}
1543 1681
1544sub size_request { 1682sub size_request {
1545 my ($self) = @_; 1683 my ($self) = @_;
1546 1684
1685 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1691
1553 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1554 1693
1555 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1698
1559 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1560 1700
1561 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1563 } 1706 };
1564 1707
1565 ($w, $h) 1708 @{ $self->{size_req} }
1566} 1709}
1567 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1568sub size_allocate { 1715sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1570 1717
1571 delete $self->{ox}; 1718 delete $self->{ox};
1572 1719
1573 delete $self->{texture} 1720 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1575} 1724}
1576 1725
1577sub set_fontsize { 1726sub set_fontsize {
1578 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1579 1728
1580 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1581 delete $self->{texture}; 1731 delete $self->{texture};
1582 1732
1583 $self->realloc; 1733 $self->realloc;
1584} 1734}
1585 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1586sub _draw { 1745sub _draw {
1587 my ($self) = @_; 1746 my ($self) = @_;
1588 1747
1589 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1590 1749
1591 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1593 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1594 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1757
1599 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1600 }; 1759 };
1601 1760
1602 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1606 1765
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1610 }; 1769 };
1611 1770
1612 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1614 1773
1615 if ($tex->{format} == GL_ALPHA) { 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1616 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1621
1622 glDisable GL_TEXTURE_2D;
1623} 1775}
1624 1776
1625############################################################################# 1777#############################################################################
1626 1778
1627package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1641 can_hover => 1, 1793 can_hover => 1,
1642 can_focus => 1, 1794 can_focus => 1,
1643 valign => 0, 1795 valign => 0,
1644 can_events => 1, 1796 can_events => 1,
1645 #text => ... 1797 #text => ...
1798 #hidden => "*",
1646 @_ 1799 @_
1647 ) 1800 )
1648} 1801}
1649 1802
1650sub _set_text { 1803sub _set_text {
… …
1652 1805
1653 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1654 1807
1655 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1656 1809
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1811 $self->{text} = $text;
1661 1812
1662 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1664 1816
1665 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1820 $self->update;
1666} 1821}
1667 1822
1668sub set_text { 1823sub set_text {
1669 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1670 1825
1671 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1827 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1828}
1676 1829
1677sub get_text { 1830sub get_text {
1678 $_[0]{text} 1831 $_[0]{text}
1679} 1832}
… …
1684 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1685 1838
1686 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1687} 1840}
1688 1841
1689sub key_down { 1842sub invoke_key_down {
1690 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1691 1844
1692 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1706 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1707 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1709 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1864 $self->emit ('escape');
1712 } elsif ($uni) { 1865 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else {
1868 return 0;
1714 } 1869 }
1715 1870
1716 $self->_set_text ($text); 1871 $self->_set_text ($text);
1717 1872
1718 $self->realloc; 1873 $self->realloc;
1719}
1720 1874
1875 1
1876}
1877
1721sub focus_in { 1878sub invoke_focus_in {
1722 my ($self) = @_; 1879 my ($self) = @_;
1723 1880
1724 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1725 1882
1726 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1727} 1884}
1728 1885
1729sub button_down { 1886sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1731 1888
1732 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 1890
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 1892
1736 # byte-index to char-index 1893 # byte-index to char-index
1737 my $text = $self->{text}; 1894 my $text = $self->{text};
1738 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1740 1897
1741 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1742 $self->update; 1899 $self->update;
1900
1901 1
1743} 1902}
1744 1903
1745sub mouse_motion { 1904sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1906# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1907
1908 1
1748} 1909}
1749 1910
1750sub _draw { 1911sub _draw {
1751 my ($self) = @_; 1912 my ($self) = @_;
1752 1913
1753 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1754 1915
1755 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1758 } else { 1919 } else {
1759 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1760 } 1921 }
1761 1922
1762 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1926 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1793 1954
1794our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1795 1956
1796use CFClient::OpenGL; 1957use CFClient::OpenGL;
1797 1958
1798sub key_down { 1959sub invoke_key_down {
1799 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1800 1961
1801 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1802 1963
1803 if ($sym == 13) { 1964 if ($sym == 13) {
1804 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1806 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1809 $self->update; 1971 $self->update;
1810 1972
1811 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1829 } else { 1991 } else {
1830 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1831 } 1993 }
1832 1994
1833 } else { 1995 } else {
1834 $self->SUPER::key_down ($ev); 1996 return $self->SUPER::invoke_key_down ($ev)
1997 }
1998
1835 } 1999 1
1836
1837} 2000}
1838 2001
1839############################################################################# 2002#############################################################################
1840 2003
1841package CFClient::UI::Button; 2004package CFClient::UI::Button;
… …
1862 can_events => 1, 2025 can_events => 1,
1863 @_ 2026 @_
1864 ) 2027 )
1865} 2028}
1866 2029
1867sub activate { }
1868
1869sub button_up { 2030sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1871 2032
1872 $self->emit ("activate") 2033 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1875} 2038}
1876 2039
1877sub _draw { 2040sub _draw {
1878 my ($self) = @_; 2041 my ($self) = @_;
1879 2042
1880 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 2044
1886 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1889 2048
… …
1926 my ($self) = @_; 2085 my ($self) = @_;
1927 2086
1928 (6) x 2 2087 (6) x 2
1929} 2088}
1930 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1931sub button_down { 2098sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1933 2100
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2103 $self->toggle;
1937 $self->_emit (changed => $self->{state}); 2104 } else {
2105 return 0
2106 }
2107
1938 } 2108 1
1939} 2109}
1940 2110
1941sub _draw { 2111sub _draw {
1942 my ($self) = @_; 2112 my ($self) = @_;
1943 2113
… …
1963package CFClient::UI::Image; 2133package CFClient::UI::Image;
1964 2134
1965our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
1966 2136
1967use CFClient::OpenGL; 2137use CFClient::OpenGL;
1968use Carp qw/confess/;
1969 2138
1970our %loaded_images; 2139our %texture_cache;
1971 2140
1972sub new { 2141sub new {
1973 my $class = shift; 2142 my $class = shift;
1974 2143
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
1976 2148
1977 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2149 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required";
1978 2151
1979 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1980 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1981 2154
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
1983 2156
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2158
1988 $self 2159 $self
1989} 2160}
1990 2161
2162sub STORABLE_freeze {
2163 my ($self, $cloning) = @_;
2164
2165 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2167
2168 $self->{path}
2169}
2170
2171sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_;
2173
2174 $self->new (path => $path)
2175}
2176
1991sub size_request { 2177sub size_request {
1992 my ($self) = @_; 2178 my ($self) = @_;
1993 2179
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1995} 2181}
1996 2182
1997sub _draw { 2183sub _draw {
1998 my ($self) = @_; 2184 my ($self) = @_;
1999 2185
… …
2009 } 2195 }
2010 2196
2011 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2199
2014 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
2015 2201
2016 glDisable GL_TEXTURE_2D; 2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::ImageButton;
2208
2209our @ISA = CFClient::UI::Image::;
2210
2211use CFClient::OpenGL;
2212
2213my %textures;
2214
2215sub new {
2216 my $class = shift;
2217
2218 my $self = $class->SUPER::new (
2219 padding_x => 4,
2220 padding_y => 4,
2221 fg => [1, 1, 1],
2222 active_fg => [0, 0, 1],
2223 can_hover => 1,
2224 align => 0,
2225 valign => 0,
2226 can_events => 1,
2227 @_
2228 );
2229}
2230
2231sub invoke_button_up {
2232 my ($self, $ev, $x, $y) = @_;
2233
2234 $self->emit ("activate")
2235 if $x >= 0 && $x < $self->{w}
2236 && $y >= 0 && $y < $self->{h};
2237
2238 1
2017} 2239}
2018 2240
2019############################################################################# 2241#############################################################################
2020 2242
2021package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2108 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
2109 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
2110 2332
2111 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2334 my $h2 = $self->{h} * (1 - $ycut2);
2335 my $h3 = $self->{h};
2336
2337 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2113 2338
2114 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2340 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2341 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2344
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2345 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2346 glBegin GL_QUADS;
… …
2135 2361
2136 if ($t3) { 2362 if ($t3) {
2137 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
2138 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
2139 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143 glEnd; 2369 glEnd;
2144 } 2370 }
2145 2371
2146 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2234 $self->update; 2460 $self->update;
2235 2461
2236 $self 2462 $self
2237} 2463}
2238 2464
2239sub changed { }
2240
2241sub set_range { 2465sub set_range {
2242 my ($self, $range) = @_; 2466 my ($self, $range) = @_;
2243 2467
2244 ($range, $self->{range}) = ($self->{range}, $range); 2468 ($range, $self->{range}) = ($self->{range}, $range);
2245 2469
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2470 if ("@$range" ne "@{$self->{range}}") {
2471 $self->update;
2472 $self->set_value ($self->{range}[0]);
2473 }
2248} 2474}
2249 2475
2250sub set_value { 2476sub set_value {
2251 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2252 2478
… …
2263 if $unit; 2489 if $unit;
2264 2490
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 2492
2267 if ($value != $old_value) { 2493 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 2494 $self->emit (changed => $value);
2269 $self->update; 2495 $self->update;
2270 } 2496 }
2271} 2497}
2272 2498
2273sub size_request { 2499sub size_request {
2274 my ($self) = @_; 2500 my ($self) = @_;
2275 2501
2276 ($self->{req_w}, $self->{req_h}) 2502 ($self->{req_w}, $self->{req_h})
2277} 2503}
2278 2504
2279sub button_down { 2505sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2281 2507
2282 $self->SUPER::button_down ($ev, $x, $y); 2508 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 2509
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2511
2286 $self->mouse_motion ($ev, $x, $y); 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2287} 2513}
2288 2514
2289sub mouse_motion { 2515sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2291 2517
2292 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 2520
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2521 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2522
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2523 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2524
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2525 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2526 } else {
2527 return 0;
2528 }
2529
2300 } 2530 1
2531}
2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2301} 2541}
2302 2542
2303sub update { 2543sub update {
2304 my ($self) = @_; 2544 my ($self) = @_;
2305 2545
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2546 delete $self->{knob_w};
2547 $self->SUPER::update;
2548}
2549
2550sub _draw {
2551 my ($self) = @_;
2552
2553 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2554 $self->set_value ($self->{range}[0]);
2308 2555
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2556 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2557 my $range = ($hi - $page - $lo) || 1e-100;
2311 2558
… …
2317 $value = ($value - $lo) / $range; 2564 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2565 $value = $value * $self->{scale} + $self->{offset};
2319 2566
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2567 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2568 $self->{knob_w} = $knob_w;
2322 }); 2569 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2570
2330 $self->SUPER::_draw (); 2571 $self->SUPER::_draw ();
2331 2572
2332 glScale $self->{w}, $self->{h}; 2573 glScale $self->{w}, $self->{h};
2333 2574
… …
2394sub set_range { shift->{slider}->set_range (@_) } 2635sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2636sub set_value { shift->{slider}->set_value (@_) }
2396 2637
2397############################################################################# 2638#############################################################################
2398 2639
2399package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2400 2641
2401our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2402 2643
2403use CFClient::OpenGL; 2644use CFClient::OpenGL;
2404 2645
2405sub new { 2646sub new {
2406 my $class = shift; 2647 my $class = shift;
2407 2648
2408 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2409 fontsize => 1, 2650 fontsize => 1,
2410 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2411 #font => default_font 2653 #font => default_font
2412 @_, 2654 @_,
2413 2655
2414 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2415 par => [], 2657 par => [],
2416 height => 0, 2658 height => 0,
2417 children => [ 2659 children => [
2418 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2419 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2430 2672
2431 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2432 $self->reflow; 2674 $self->reflow;
2433} 2675}
2434 2676
2677sub size_request {
2678 my ($self) = @_;
2679
2680 my ($empty, $slider) = @{ $self->{children} };
2681
2682 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request
2684}
2685
2435sub size_allocate { 2686sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 2687 my ($self, $w, $h) = @_;
2437 2688
2438 $self->SUPER::size_allocate ($w, $h); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 2691
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $self->{layout}->set_width ($self->{children}[0]{w}); 2694 $self->{layout}->set_width ($empty->{w});
2695 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443 2696
2444 $self->reflow; 2697 $self->reflow;
2445}
2446 2698
2447sub text_size { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2448 my ($self, $text, $indent) = @_; 2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2711}
2712
2713sub get_layout {
2714 my ($self, $para) = @_;
2449 2715
2450 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2451 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent); 2721 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2722 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454 $layout->set_markup ($text); 2723 $layout->set_markup ($para->{markup});
2724
2725 $layout->set_shapes (
2726 map
2727 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2728 @{$para->{widget}}
2455 2729 );
2730
2456 $layout->size 2731 $layout
2457} 2732}
2458 2733
2459sub reflow { 2734sub reflow {
2460 my ($self) = @_; 2735 my ($self) = @_;
2461 2736
… …
2470 $self->{children}[1]->set_value ($offset); 2745 $self->{children}[1]->set_value ($offset);
2471} 2746}
2472 2747
2473sub clear { 2748sub clear {
2474 my ($self) = @_; 2749 my ($self) = @_;
2750
2751 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other;
2475 2753
2476 $self->{par} = []; 2754 $self->{par} = [];
2477 $self->{height} = 0; 2755 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 2757}
2480 2758
2481sub add_paragraph { 2759sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 2760 my ($self, $color, $para, $indent) = @_;
2483 2761
2484 for my $line (split /\n/, $text) { 2762 my ($text, @w) = ref $para ? @$para : $para;
2485 my ($w, $h) = $self->text_size ($line); 2763
2486 $self->{height} += $h; 2764 $para = {
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2765 w => 1e10,
2766 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2488 } 2771 };
2489 2772
2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2773 $self->add (@w) if @w;
2774 push @{$self->{par}}, $para;
2775
2776 $self->{need_reflow}++;
2777 $self->update;
2778}
2779
2780sub scroll_to_bottom {
2781 my ($self) = @_;
2782
2783 $self->{scroll_to_bottom} = 1;
2784 $self->update;
2491} 2785}
2492 2786
2493sub update { 2787sub update {
2494 my ($self) = @_; 2788 my ($self) = @_;
2495 2789
… …
2497 2791
2498 return unless $self->{h} > 0; 2792 return unless $self->{h} > 0;
2499 2793
2500 delete $self->{texture}; 2794 delete $self->{texture};
2501 2795
2502 $ROOT->on_post_alloc ($self, sub { 2796 $ROOT->on_post_alloc ($self => sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 2798
2505 if (delete $self->{need_reflow}) { 2799 if (delete $self->{need_reflow}) {
2506 my $height = 0; 2800 my $height = 0;
2507 2801
2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512 for (@{$self->{par}}) { 2802 for my $para (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2514 $layout->set_width ($W - $_->[3]); 2804 my $layout = $self->get_layout ($para);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size; 2805 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3]; 2806
2518 $_->[1] = $h; 2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2519 } 2810 }
2520 2811
2521 $height += $_->[1]; 2812 $height += $para->{h};
2522 } 2813 }
2523 2814
2524 $self->{height} = $height; 2815 $self->{height} = $height;
2525 2816
2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527 2818
2528 delete $self->{texture}; 2819 delete $self->{texture};
2529 } 2820 }
2530 2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2827 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2828 glClear GL_COLOR_BUFFER_BIT;
2534 2829
2535 my $top = int $self->{children}[1]{range}[0]; 2830 my $top = int $self->{children}[1]{range}[0];
2536 2831
2537 my $y0 = $top; 2832 my $y0 = $top;
2538 my $y1 = $top + $H; 2833 my $y1 = $top + $H;
2539 2834
2540 my $y = 0; 2835 my $y = 0;
2541 2836
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2550 for my $par (@{$self->{par}}) { 2837 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 2838 my $h = $para->{h};
2552 2839
2553 if ($y0 < $y + $h && $y < $y1) { 2840 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2556 $layout->set_markup ($par->[4]);
2557 2841
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2842 my $layout = $self->get_layout ($para);
2559 2843
2560 glRasterPos $par->[3], $y - $y0; 2844 $layout->render ($para->{indent}, $y - $y0);
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2845
2846 if (my @w = @{ $para->{widget} }) {
2847 my @s = $layout->get_shapes;
2848
2849 for (@w) {
2850 my ($dx, $dy) = splice @s, 0, 2, ();
2851
2852 $_->{x} = $dx + $para->{indent};
2853 $_->{y} = $dy + $y - $y0;
2854
2855 $_->draw;
2856 }
2857 }
2562 } 2858 }
2563 2859
2564 $y += $h; 2860 $y += $h;
2565 } 2861 }
2566
2567 glDisable GL_BLEND;
2568 }; 2862 };
2569 }); 2863 });
2570} 2864}
2571 2865
2866sub reconfigure {
2867 my ($self) = @_;
2868
2869 $self->SUPER::reconfigure;
2870
2871 $_->{w} = 1e10 for @{ $self->{par} };
2872 $self->reflow;
2873}
2874
2572sub _draw { 2875sub _draw {
2573 my ($self) = @_; 2876 my ($self) = @_;
2574 2877
2575 glEnable GL_TEXTURE_2D; 2878 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2880 glColor 0, 0, 0, 1;
2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2881 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579 glDisable GL_TEXTURE_2D; 2882 glDisable GL_TEXTURE_2D;
2580 2883
2581 $self->{children}[1]->draw; 2884 $self->{children}[1]->draw;
2582
2583} 2885}
2584 2886
2585############################################################################# 2887#############################################################################
2586 2888
2587package CFClient::UI::Animator; 2889package CFClient::UI::Animator;
… …
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 2976 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2977 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 2978 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 2979 . "visible $widget->{visible}";
2678 } 2980 }
2981
2982 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//;
2679 2984
2680 $self->add (new CFClient::UI::Label 2985 $self->add (new CFClient::UI::Label
2681 markup => $tooltip, 2986 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 2988 fontsize => 0.8,
… …
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2998 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 2999
2695 ($w + 4, $h + 4) 3000 ($w + 4, $h + 4)
2696} 3001}
2697 3002
2698sub size_allocate { 3003sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 3004 my ($self, $w, $h) = @_;
2700 3005
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 3006 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 3007}
2703 3008
2704sub visibility_change { 3009sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 3010 my ($self, $visible) = @_;
2706 3011
2707 return unless $visible; 3012 return unless $visible;
2708 3013
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 3014 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner} 3015 my $widget = $self->{owner}
2711 or return; 3016 or return;
2712 3017
3018 if ($widget->{visible}) {
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3019 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 3020
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3021 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 3022 if $x + $self->{w} > $self->{root}{w};
2717 3023
2718 $self->move_abs ($x, $y); 3024 $self->move_abs ($x, $y);
3025 } else {
3026 $self->hide;
3027 }
2719 }); 3028 });
2720} 3029}
2721 3030
2722sub _draw { 3031sub _draw {
2723 my ($self) = @_; 3032 my ($self) = @_;
… …
2749 3058
2750############################################################################# 3059#############################################################################
2751 3060
2752package CFClient::UI::Face; 3061package CFClient::UI::Face;
2753 3062
2754our @ISA = CFClient::UI::Base::; 3063our @ISA = CFClient::UI::DrawBG::;
2755 3064
2756use CFClient::OpenGL; 3065use CFClient::OpenGL;
2757 3066
2758sub new { 3067sub new {
2759 my $class = shift; 3068 my $class = shift;
… …
2796sub _draw { 3105sub _draw {
2797 my ($self) = @_; 3106 my ($self) = @_;
2798 3107
2799 return unless $::CONN; 3108 return unless $::CONN;
2800 3109
3110 $self->SUPER::_draw;
3111
2801 my $face; 3112 my $face;
2802 3113
2803 if ($self->{frame}) { 3114 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}]; 3115 my $anim = $::CONN->{anim}[$self->{anim}];
2805 3116
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3121 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 3122
2812 if ($tex) { 3123 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3124 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3126 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3127 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3128 glDisable GL_TEXTURE_2D;
2818 } 3129 }
2819} 3130}
2820 3131
2821sub DESTROY { 3132sub destroy {
2822 my ($self) = @_; 3133 my ($self) = @_;
2823 3134
2824 $self->{timer}->cancel 3135 $self->{timer}->cancel
2825 if $self->{timer}; 3136 if $self->{timer};
2826 3137
2827 $self->SUPER::DESTROY; 3138 $self->SUPER::destroy;
2828} 3139}
3140
3141#############################################################################
3142
3143package CFClient::UI::Buttonbar;
3144
3145our @ISA = CFClient::UI::HBox::;
3146
3147# TODO: should actualyl wrap buttons and other goodies.
2829 3148
2830############################################################################# 3149#############################################################################
2831 3150
2832package CFClient::UI::Menu; 3151package CFClient::UI::Menu;
2833 3152
… …
2845 ); 3164 );
2846 3165
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3166 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 3167
2849 for my $item (@{ $self->{items} }) { 3168 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3169 my ($widget, $cb, $tooltip) = @$item;
2851 3170
2852 # handle various types of items, only text for now 3171 # handle various types of items, only text for now
2853 if (!ref $widget) { 3172 if (!ref $widget) {
3173 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2;
3175
3176 $widget = new CFClient::UI::HBox
3177 can_hover => 1,
3178 can_events => 1,
3179 tooltip => $tooltip,
3180 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1),
3183 ],
3184 ;
3185
3186 } else {
2854 $widget = new CFClient::UI::Label 3187 $widget = new CFClient::UI::Label
2855 can_hover => 1, 3188 can_hover => 1,
2856 can_events => 1, 3189 can_events => 1,
2857 text => $widget; 3190 markup => $widget,
3191 tooltip => $tooltip;
3192 }
2858 } 3193 }
2859 3194
2860 $self->{item}{$widget} = $item; 3195 $self->{item}{$widget} = $item;
2861 3196
2862 $self->{vbox}->add ($widget); 3197 $self->{vbox}->add ($widget);
… …
2867 3202
2868# popup given the event (must be a mouse button down event currently) 3203# popup given the event (must be a mouse button down event currently)
2869sub popup { 3204sub popup {
2870 my ($self, $ev) = @_; 3205 my ($self, $ev) = @_;
2871 3206
2872 $self->_emit ("popdown"); 3207 $self->emit ("popdown");
2873 3208
2874 # maybe save $GRAB? must be careful about events... 3209 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3210 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3211 $self->{button} = $ev->{button};
2877 3212
2878 $self->show; 3213 $self->show;
2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3214 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 3215}
2881 3216
2882sub mouse_motion { 3217sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3218 my ($self, $ev, $x, $y) = @_;
2884 3219
2885 # TODO: should use vbox->find_widget or so 3220 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3221 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3222 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3223
3224 0
3225}
3226
2890sub button_up { 3227sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3228 my ($self, $ev, $x, $y) = @_;
2892 3229
2893 if ($ev->{button} == $self->{button}) { 3230 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3231 undef $GRAB;
2895 $self->hide; 3232 $self->hide;
2896 3233
2897 $self->_emit ("popdown"); 3234 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3235 $self->{hover}[1]->() if $self->{hover};
3236 } else {
3237 return 0
3238 }
3239
2899 } 3240 1
2900} 3241}
2901 3242
2902############################################################################# 3243#############################################################################
2903 3244
2904package CFClient::UI::Statusbox; 3245package CFClient::UI::Multiplexer;
2905 3246
2906our @ISA = CFClient::UI::VBox::; 3247our @ISA = CFClient::UI::Container::;
2907 3248
2908sub new { 3249sub new {
2909 my $class = shift; 3250 my $class = shift;
2910 3251
2911 $class->SUPER::new ( 3252 my $self = $class->SUPER::new (
3253 @_,
3254 );
3255
3256 $self->{current} = $self->{children}[0]
3257 if @{ $self->{children} };
3258
3259 $self
3260}
3261
3262sub add {
3263 my ($self, @widgets) = @_;
3264
3265 $self->SUPER::add (@widgets);
3266
3267 $self->{current} = $self->{children}[0]
3268 if @{ $self->{children} };
3269}
3270
3271sub get_current_page {
3272 my ($self) = @_;
3273
3274 $self->{current}
3275}
3276
3277sub set_current_page {
3278 my ($self, $page_or_widget) = @_;
3279
3280 my $widget = ref $page_or_widget
3281 ? $page_or_widget
3282 : $self->{children}[$page_or_widget];
3283
3284 $self->{current} = $widget;
3285 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3286
3287 $self->emit (page_changed => $self->{current});
3288
3289 $self->realloc;
3290}
3291
3292sub visible_children {
3293 $_[0]{current}
3294}
3295
3296sub size_request {
3297 my ($self) = @_;
3298
3299 $self->{current}->size_request
3300}
3301
3302sub invoke_size_allocate {
3303 my ($self, $w, $h) = @_;
3304
3305 $self->{current}->configure (0, 0, $w, $h);
3306
3307 1
3308}
3309
3310sub _draw {
3311 my ($self) = @_;
3312
3313 $self->{current}->draw;
3314}
3315
3316#############################################################################
3317
3318package CFClient::UI::Notebook;
3319
3320our @ISA = CFClient::UI::VBox::;
3321
3322sub new {
3323 my $class = shift;
3324
3325 my $self = $class->SUPER::new (
3326 buttonbar => (new CFClient::UI::Buttonbar),
3327 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3328 # filter => # will be put between multiplexer and $self
3329 @_,
3330 );
3331
3332 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3333 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3334
3335 $self
3336}
3337
3338sub add {
3339 my ($self, $title, $widget, $tooltip) = @_;
3340
3341 Scalar::Util::weaken $self;
3342
3343 $self->{buttonbar}->add (new CFClient::UI::Button
3344 markup => $title,
3345 tooltip => $tooltip,
3346 on_activate => sub { $self->set_current_page ($widget) },
3347 );
3348
3349 $self->{multiplexer}->add ($widget);
3350}
3351
3352sub get_current_page {
3353 my ($self) = @_;
3354
3355 $self->{multiplexer}->get_current_page
3356}
3357
3358sub set_current_page {
3359 my ($self, $page) = @_;
3360
3361 $self->{multiplexer}->set_current_page ($page);
3362 $self->emit (page_changed => $self->{multiplexer}{current});
3363}
3364
3365#############################################################################
3366
3367package CFClient::UI::Selector;
3368
3369use utf8;
3370
3371our @ISA = CFClient::UI::Button::;
3372
3373sub new {
3374 my $class = shift;
3375
3376 my $self = $class->SUPER::new (
3377 options => [], # [value, title, longdesc], ...
3378 value => undef,
3379 @_,
3380 );
3381
3382 $self->_set_value ($self->{value});
3383
3384 $self
3385}
3386
3387sub invoke_button_down {
3388 my ($self, $ev) = @_;
3389
3390 my @menu_items;
3391
3392 for (@{ $self->{options} }) {
3393 my ($value, $title, $tooltip) = @$_;
3394
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 }
3397
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399}
3400
3401sub _set_value {
3402 my ($self, $value) = @_;
3403
3404 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3405 or return;
3406
3407 $self->{value} = $item->[0];
3408 $self->set_markup ("$item->[1] ⇓");
3409 $self->set_tooltip ($item->[2]);
3410}
3411
3412sub set_value {
3413 my ($self, $value) = @_;
3414
3415 return unless $self->{value} ne $value;
3416
3417 $self->_set_value ($value);
3418 $self->emit (changed => $value);
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::Statusbox;
3424
3425our @ISA = CFClient::UI::VBox::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3431 fontsize => 0.8,
2913 @_, 3432 @_,
2914 ) 3433 );
3434
3435 Scalar::Util::weaken (my $this = $self);
3436
3437 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438
3439 $self
2915} 3440}
2916 3441
2917sub reorder { 3442sub reorder {
2918 my ($self) = @_; 3443 my ($self) = @_;
2919 my $NOW = time; 3444 my $NOW = Time::HiRes::time;
3445
3446 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} };
2920 3450
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3451 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3452 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3453 }
2924 3454
… …
2927 my @items = sort { 3457 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3458 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3459 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3460 } values %{ $self->{item} };
2931 3461
3462 $self->{timer}->interval (1);
3463
2932 my $count = 10 + 1; 3464 my $count = 10 + 1;
2933 for my $item (@items) { 3465 for my $item (@items) {
2934 last unless --$count; 3466 last unless --$count;
2935 3467
2936 push @widgets, $item->{label} ||= do { 3468 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3469 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3470 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3471 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3472 : $item->{text};
2941 3473
… …
2949 tooltip => $item->{tooltip}, 3481 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3482 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3483 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3484 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3485 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3486 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3487 can_events => 1,
2956 can_hover => 1 3488 can_hover => 1
2957 }; 3489 };
3490
3491 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3492 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3493 $label->update;
3494 $label->set_max_size (undef, $label->{req_h} * $diff)
3495 if $diff < 1;
3496 $self->{timer}->interval (1/30);
3497 } else {
3498 $label->{fg}[3] = $item->{fg}[3] || 1;
3499 }
3500
3501 push @widgets, $label;
2958 } 3502 }
2959 3503
2960 $self->clear; 3504 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3505 $self->SUPER::add (reverse @widgets);
2962} 3506}
… …
2967 $text =~ s/^\s+//; 3511 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3512 $text =~ s/\s+$//;
2969 3513
2970 return unless $text; 3514 return unless $text;
2971 3515
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3516 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3517
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3518 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3519
2976 if (my $item = $self->{item}{$group}) { 3520 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3521 if ($item->{text} eq $text) {
2978 $item->{count}++; 3522 $item->{count}++;
2979 } else { 3523 } else {
2980 $item->{count} = 1; 3524 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3525 $item->{text} = $item->{tooltip} = $text;
2982 } 3526 }
2983 $item->{id} = ++$self->{id}; 3527 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3528 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3529 delete $item->{label};
2986 } else { 3530 } else {
2987 $self->{item}{$group} = { 3531 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3532 id => ++$self->{id},
… …
2994 count => 1, 3538 count => 1,
2995 %arg, 3539 %arg,
2996 }; 3540 };
2997 } 3541 }
2998 3542
3543 $ROOT->on_refresh (reorder => sub {
2999 $self->reorder; 3544 $self->reorder;
3545 });
3000} 3546}
3001 3547
3002sub reconfigure { 3548sub reconfigure {
3003 my ($self) = @_; 3549 my ($self) = @_;
3004 3550
… …
3007 3553
3008 $self->reorder; 3554 $self->reorder;
3009 $self->SUPER::reconfigure; 3555 $self->SUPER::reconfigure;
3010} 3556}
3011 3557
3558sub destroy {
3559 my ($self) = @_;
3560
3561 $self->{timer}->cancel;
3562
3563 $self->SUPER::destroy;
3564}
3565
3012############################################################################# 3566#############################################################################
3013 3567
3014package CFClient::UI::Inventory; 3568package CFClient::UI::Inventory;
3015 3569
3016our @ISA = CFClient::UI::ScrolledWindow::; 3570our @ISA = CFClient::UI::Table::;
3017 3571
3018sub new { 3572sub new {
3019 my $class = shift; 3573 my $class = shift;
3020 3574
3021 my $self = $class->SUPER::new ( 3575 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3576 col_expand => [0, 1, 0],
3577 items => [],
3023 @_, 3578 @_,
3024 ); 3579 );
3025 3580
3581 $self->set_sort_order (undef);
3582
3026 $self 3583 $self
3584}
3585
3586sub update_items {
3587 my ($self) = @_;
3588
3589 $self->clear;
3590
3591 my @item = $self->{sort}->(@{ $self->{items} });
3592
3593 my @adds;
3594 my $row = 0;
3595 for my $item ($self->{sort}->(@{ $self->{items} })) {
3596 CFClient::Item::update_widgets $item;
3597
3598 push @adds, 0, $row, $item->{face_widget};
3599 push @adds, 1, $row, $item->{desc_widget};
3600 push @adds, 2, $row, $item->{weight_widget};
3601
3602 $row++;
3603 }
3604
3605 $self->add (@adds);
3606}
3607
3608sub set_sort_order {
3609 my ($self, $order) = @_;
3610
3611 $self->{sort} = $order ||= sub {
3612 sort {
3613 $a->{type} <=> $b->{type}
3614 or $a->{name} cmp $b->{name}
3615 } @_
3616 };
3617
3618 $self->update_items;
3027} 3619}
3028 3620
3029sub set_items { 3621sub set_items {
3030 my ($self, $items) = @_; 3622 my ($self, $items) = @_;
3031 3623
3032 $self->{scrolled}->clear; 3624 $self->{items} = [$items ? values %$items : ()];
3033 return unless $items; 3625 $self->update_items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052} 3626}
3053 3627
3054############################################################################# 3628#############################################################################
3055 3629
3056package CFClient::UI::BindEditor; 3630package CFClient::UI::SpellList;
3057 3631
3058our @ISA = CFClient::UI::FancyFrame::; 3632our @ISA = CFClient::UI::Table::;
3059 3633
3060sub new { 3634sub new {
3061 my $class = shift; 3635 my $class = shift;
3062 3636
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3637 my $self = $class->SUPER::new (
3638 binding => [],
3639 commands => [],
3640 @_,
3641 )
3642}
3064 3643
3065 $self->add (my $vb = new CFClient::UI::VBox); 3644my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3066 3645
3646my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3067 3656
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3657sub rebuild_spell_list {
3069 text => "start recording", 3658 my ($self) = @_;
3070 tooltip => "Start/Stops recording of actions." 3659
3071 ."All subsequent actions after the recording started will be captured." 3660 $CFClient::UI::ROOT->on_refresh ($self => sub {
3072 ."The actions are displayed after the record was stopped." 3661 $self->clear;
3073 ."To bind the action you have to click on the 'Bind' button", 3662
3074 on_activate => sub { 3663 return unless $::CONN;
3075 unless ($self->{recording}) { 3664
3076 $self->start; 3665 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671 my $row = 0;
3672
3673 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674 my $spell = $self->{spell}{$_};
3675
3676 $row++;
3677
3678 my $spell_cb = sub {
3679 my ($widget, $ev) = @_;
3680
3681 if ($ev->{button} == 1) {
3682 $::CONN->user_send ("cast $spell->{name}");
3683 } elsif ($ev->{button} == 2) {
3684 $::CONN->user_send ("invoke $spell->{name}");
3685 } elsif ($ev->{button} == 3) {
3686 (new CFClient::UI::Menu
3687 items => [
3688 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690 ],
3691 )->popup ($ev);
3077 } else { 3692 } else {
3078 $self->stop; 3693 return 0;
3694 }
3695
3696 1
3079 } 3697 };
3698
3699 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701 #TODO: add path info to tooltip
3702 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704 $self->add (0, $row, new CFClient::UI::Face
3705 face => $spell->{face},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (1, $row, new CFClient::UI::Label
3713 expand => 1,
3714 text => $spell->{name},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3080 }); 3725 }
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156# if $commit is true, the binding will be set after the user entered a key combo
3157sub ask_for_bind {
3158 my ($self, $commit) = @_;
3159
3160 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_;
3162 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163 $self->update_binding_widgets;
3164 $self->commit if $commit;
3165 }); 3726 });
3166} 3727}
3167 3728
3168# $mod and $sym are the modifiers and key symbol
3169# $cmds is a array ref of strings (the commands)
3170# $cb is the callback that is executed on OK
3171# $ccb is the callback that is executed on CANCEL and
3172# when the binding was unsuccessful on OK
3173sub set_binding {
3174 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3175
3176 $self->clear_command_list;
3177 $self->{recording} = 0;
3178 $self->{rec_btn}->set_text ("start recording");
3179
3180 $self->{binding} = [$mod, $sym];
3181 $self->{commands} = $cmds;
3182
3183 $self->{binding_change} = $cb;
3184 $self->{binding_cancel} = $ccb;
3185
3186 $self->update_binding_widgets;
3187}
3188
3189# this is a shortcut method that asks for a binding
3190# and then just binds it.
3191sub do_quick_binding {
3192 my ($self, $cmds) = @_;
3193 $self->set_binding (undef, undef, $cmds, sub {
3194 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195 });
3196 $self->ask_for_bind (1);
3197}
3198
3199sub update_binding_widgets {
3200 my ($self) = @_;
3201 my ($mod, $sym, $cmds) = $self->get_binding;
3202 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203 $self->set_command_list ($cmds);
3204}
3205
3206sub get_binding {
3207 my ($self) = @_;
3208 return (
3209 $self->{binding}->[0],
3210 $self->{binding}->[1],
3211 [ grep { defined $_ } @{$self->{commands}} ]
3212 );
3213}
3214
3215sub clear_command_list {
3216 my ($self) = @_;
3217 $self->{cmdbox}->clear ();
3218}
3219
3220sub set_command_list {
3221 my ($self, $cmds) = @_;
3222
3223 $self->{cmdbox}->clear ();
3224 $self->{commands} = $cmds;
3225
3226 my $idx = 0;
3227
3228 for (@$cmds) {
3229 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231 my $i = $idx;
3232 $hb->add (new CFClient::UI::Label text => $_);
3233 $hb->add (new CFClient::UI::Button
3234 text => "delete",
3235 tooltip => "Deletes the action from the record",
3236 on_activate => sub {
3237 $self->{cmdbox}->remove ($hb);
3238 $cmds->[$i] = undef;
3239 });
3240
3241
3242 $idx++
3243 }
3244}
3245
3246#############################################################################
3247
3248package CFClient::UI::SpellList;
3249
3250our @ISA = CFClient::UI::FancyFrame::;
3251
3252sub new {
3253 my $class = shift;
3254
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257 $self->add (new CFClient::UI::ScrolledWindow
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260 $self;
3261}
3262
3263# XXX: Do sorting? Argl...
3264sub add_spell { 3729sub add_spell {
3265 my ($self, $spell) = @_; 3730 my ($self, $spell) = @_;
3731
3266 $self->{spells}->{$spell->{name}} = $spell; 3732 $self->{spell}->{$spell->{name}} = $spell;
3267 3733 $self->rebuild_spell_list;
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295} 3734}
3296 3735
3297sub remove_spell { 3736sub remove_spell {
3298 my ($self, $spell) = @_; 3737 my ($self, $spell) = @_;
3738
3299 delete $self->{spells}->{$spell->{name}}; 3739 delete $self->{spell}->{$spell->{name}};
3300 $self->rebuild_spell_list; 3740 $self->rebuild_spell_list;
3301} 3741}
3302 3742
3743sub clear_spells {
3744 my ($self) = @_;
3745
3746 $self->{spell} = {};
3747 $self->rebuild_spell_list;
3748}
3749
3303############################################################################# 3750#############################################################################
3304 3751
3305package CFClient::UI::Root; 3752package CFClient::UI::Root;
3306 3753
3307our @ISA = CFClient::UI::Container::; 3754our @ISA = CFClient::UI::Container::;
3755
3756use List::Util qw(min max);
3308 3757
3309use CFClient::OpenGL; 3758use CFClient::OpenGL;
3310 3759
3311sub new { 3760sub new {
3312 my $class = shift; 3761 my $class = shift;
… …
3339 $coord = $max - $size if $coord > $max - $size; 3788 $coord = $max - $size if $coord > $max - $size;
3340 3789
3341 int $coord + 0.5 3790 int $coord + 0.5
3342} 3791}
3343 3792
3344sub size_allocate { 3793sub invoke_size_allocate {
3345 my ($self, $w, $h) = @_; 3794 my ($self, $w, $h) = @_;
3346 3795
3347 for my $child ($self->children) { 3796 for my $child ($self->children) {
3348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3797 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3349 3798
… …
3353 $X = _to_pixel $X, $W, $self->{w}; 3802 $X = _to_pixel $X, $W, $self->{w};
3354 $Y = _to_pixel $Y, $H, $self->{h}; 3803 $Y = _to_pixel $Y, $H, $self->{h};
3355 3804
3356 $child->configure ($X, $Y, $W, $H); 3805 $child->configure ($X, $Y, $W, $H);
3357 } 3806 }
3807
3808 1
3358} 3809}
3359 3810
3360sub coord2local { 3811sub coord2local {
3361 my ($self, $x, $y) = @_; 3812 my ($self, $x, $y) = @_;
3362 3813
… …
3447 3898
3448 delete $queue{$widget+0}; 3899 delete $queue{$widget+0};
3449 3900
3450 my ($w, $h) = $widget->size_request; 3901 my ($w, $h) = $widget->size_request;
3451 3902
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3903 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3904 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3905
3906 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3907 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3454 3908
3455 $w = $widget->{force_w} if exists $widget->{force_w}; 3909 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h}; 3910 $h = $widget->{force_h} if exists $widget->{force_h};
3457 3911
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3912 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3484 3938
3485 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3939 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3486 3940
3487 $w = 0 if $w < 0; 3941 $w = 0 if $w < 0;
3488 $h = 0 if $h < 0; 3942 $h = 0 if $h < 0;
3943
3944 $w = max $widget->{min_w}, $w;
3945 $h = max $widget->{min_h}, $h;
3946
3947# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3948# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3949
3950 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3951 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3489 3952
3490 $w = int $w + 0.5; 3953 $w = int $w + 0.5;
3491 $h = int $h + 0.5; 3954 $h = int $h + 0.5;
3492 3955
3493 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3956 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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