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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.339 by root, Sun Jul 30 12:15:19 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
89 105
90 $GRAB = $widget; 106 $GRAB = $widget;
91 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
92 108
93 check_tooltip; 109 $TOOLTIP_WATCHER->cb->();
94 } 110 }
95 111
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
97 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
99 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
188 203
189 } 204 }
190 } 205 }
191 206
192 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
193} 216}
194 217
195############################################################################# 218#############################################################################
196 219
197package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $self->{x} = List::Util::max 0, int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
338} 360}
339 361
362sub baseline_shift {
363 0
364}
365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
343 if ($self->{aspect}) { 369 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
345 371
346 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
348 374
349 # use alignment to adjust x, y 375 # use alignment to adjust x, y
350 376
351 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
366 392
367 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
368 } 394 }
369} 395}
370 396
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 397sub children {
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;
… …
1050my @border = 1142my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
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 = shift; 1147 my ($class, %arg) = @_;
1056 1148
1057 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1058 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1059 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1060 border => 0.6, 1152 border => 0.6,
1061 can_events => 1, 1153 can_events => 1,
1062 min_w => 16, 1154 min_w => 64,
1063 min_h => 16, 1155 min_h => 32,
1064 @_ 1156 %arg,
1065 ); 1157 );
1066 1158
1067 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1068 align => 0, 1160 align => 0,
1069 valign => 1, 1161 valign => 1,
1070 text => $self->{title}, 1162 text => $self->{title},
1071 fontsize => $self->{border}; 1163 fontsize => $self->{border},
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 }
1072 1174
1073 $self 1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1074} 1184}
1075 1185
1076sub border { 1186sub border {
1077 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1078} 1188}
1079 1189
1080sub size_request { 1190sub size_request {
1081 my ($self) = @_; 1191 my ($self) = @_;
1192
1193 $self->{title_widget}->size_request
1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1082 1198
1083 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1084 1200
1085 ( 1201 (
1086 $w + $self->border * 2, 1202 $w + $self->border * 2,
1087 $h + $self->border * 2, 1203 $h + $self->border * 2,
1088 ) 1204 )
1089} 1205}
1090 1206
1091sub size_allocate { 1207sub invoke_size_allocate {
1092 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1093 1209
1210 if ($self->{title_widget}) {
1211 $self->{title_widget}{w} = $w;
1212 $self->{title_widget}{h} = $h;
1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1214 }
1215
1216 my $border = $self->border;
1217
1094 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1095 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1096 1220
1097 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1098 if $self->{title};
1099
1100 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1101}
1102 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;
1233
1234 1
1235}
1236
1103sub button_down { 1237sub invoke_button_down {
1104 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1105 1239
1106 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1107 my $border = $self->border; 1241 my $border = $self->border;
1108 1242
… …
1124 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1125 1259
1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 $self->realloc; 1264 $self->realloc;
1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1131 }; 1265 };
1132 1266
1133 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1134 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1135 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1138 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1139 1273
1140 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1141 1275
1142 $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});
1143 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1144 } 1284 1
1145} 1285}
1146 1286
1147sub button_up { 1287sub invoke_button_up {
1148 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1149 1289
1150 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1151} 1291}
1152 1292
1153sub mouse_motion { 1293sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1155 1295
1156 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1299}
1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1157} 1307}
1158 1308
1159sub _draw { 1309sub _draw {
1160 my ($self) = @_; 1310 my ($self) = @_;
1161 1311
1312 my $child = $self->{children}[0];
1313
1162 my ($w, $h ) = ($self->{w}, $self->{h}); 1314 my ($w, $h ) = ($self->{w}, $self->{h});
1163 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1315 my ($cw, $ch) = ($child->{w}, $child->{h});
1164 1316
1165 glEnable GL_TEXTURE_2D; 1317 glEnable GL_TEXTURE_2D;
1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1167 1319
1168 my $border = $self->border; 1320 my $border = $self->border;
… …
1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1335 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184 } 1336 }
1185 1337
1186 glDisable GL_TEXTURE_2D; 1338 glDisable GL_TEXTURE_2D;
1187 1339
1188 $self->{title}->draw if $self->{title};
1189
1190 $self->child->draw; 1340 $child->draw;
1341
1342 if ($self->{title_widget}) {
1343 glTranslate 0, $border - $self->{h};
1344 $self->{title_widget}->_draw;
1345
1346 glTranslate 0, - ($border - $self->{h});
1347 }
1348
1349 $self->{close_button}->draw
1350 if $self->{close_button};
1191} 1351}
1192 1352
1193############################################################################# 1353#############################################################################
1194 1354
1195package CFClient::UI::Table; 1355package CFClient::UI::Table;
… …
1212sub children { 1372sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1214} 1374}
1215 1375
1216sub add { 1376sub add {
1217 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1218 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1219 $child->set_parent ($self); 1381 $child->set_parent ($self);
1220 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1221 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1222 $self->realloc; 1387 $self->realloc;
1388}
1389
1390sub remove {
1391 my ($self, $child) = @_;
1392
1393 # TODO: not yet implemented
1223} 1394}
1224 1395
1225# TODO: move to container class maybe? send children a signal on removal? 1396# TODO: move to container class maybe? send children a signal on removal?
1226sub clear { 1397sub clear {
1227 my ($self) = @_; 1398 my ($self) = @_;
… …
1268 (sum @$ws), 1439 (sum @$ws),
1269 (sum @$hs), 1440 (sum @$hs),
1270 ) 1441 )
1271} 1442}
1272 1443
1273sub size_allocate { 1444sub invoke_size_allocate {
1274 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1275 1446
1276 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1277 1448
1278 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1310 } 1481 }
1311 1482
1312 $y += $row_h; 1483 $y += $row_h;
1313 } 1484 }
1314 1485
1486 1
1315} 1487}
1316 1488
1317sub find_widget { 1489sub find_widget {
1318 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1319 1491
… …
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 ) 1530 )
1359} 1531}
1360 1532
1361sub size_allocate { 1533sub invoke_size_allocate {
1362 my ($self, $w, $h) = @_; 1534 my ($self, $w, $h) = @_;
1363 1535
1364 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1365 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1366 1538
1367 my @req; 1539 my @req;
1368 1540
1369 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1370 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1371 } else { 1543 } else {
1372 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1373 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1374 1546
1375 if ($req > $space) { 1547 if ($req > $space) {
1376 # ah well, not enough space 1548 # ah well, not enough space
1377 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1378 } else { 1550 } else {
1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1380 1552
1381 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1382 1554
1383 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1384 for 0 .. $#$children; 1556 for 0 .. $#children;
1385 } 1557 }
1386 } 1558 }
1387 1559
1388 CFClient::UI::harmonize \@req; 1560 CFClient::UI::harmonize \@req;
1389 1561
1390 my $pos = 0; 1562 my $pos = 0;
1391 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1392 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1394 1566
1395 $pos += $alloc; 1567 $pos += $alloc;
1396 } 1568 }
1397 1569
1398 1 1570 1
… …
1471 } 1643 }
1472 1644
1473 $self 1645 $self
1474} 1646}
1475 1647
1476sub escape($) {
1477 local $_ = $_[0];
1478
1479 s/&/&amp;/g;
1480 s/>/&gt;/g;
1481 s/</&lt;/g;
1482
1483 $_
1484}
1485
1486sub update { 1648sub update {
1487 my ($self) = @_; 1649 my ($self) = @_;
1488 1650
1489 delete $self->{texture}; 1651 delete $self->{texture};
1490 $self->SUPER::update; 1652 $self->SUPER::update;
1491} 1653}
1492 1654
1655sub realloc {
1656 my ($self) = @_;
1657
1658 delete $self->{ox};
1659 $self->SUPER::realloc;
1660}
1661
1493sub set_text { 1662sub set_text {
1494 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1495 1664
1496 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1497 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1498 1667
1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1500 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1501 1669
1670 delete $self->{size_req};
1502 $self->realloc; 1671 $self->realloc;
1503 $self->update; 1672 $self->update;
1504} 1673}
1505 1674
1506sub set_markup { 1675sub set_markup {
… …
1509 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1510 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1511 1680
1512 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513 1682
1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1515 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1516 1684
1685 delete $self->{size_req};
1517 $self->realloc; 1686 $self->realloc;
1518 $self->update; 1687 $self->update;
1519} 1688}
1520 1689
1521sub size_request { 1690sub size_request {
1522 my ($self) = @_; 1691 my ($self) = @_;
1523 1692
1693 $self->{size_req} ||= do {
1524 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1525 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1699
1530 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1531 1701
1532 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1533 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1534 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1535 1706
1536 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1537 1708
1538 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1539 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1711 }
1712
1713 [$w, $h]
1540 } 1714 };
1541 1715
1542 ($w, $h) 1716 @{ $self->{size_req} }
1543} 1717}
1544 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1545sub size_allocate { 1723sub invoke_size_allocate {
1546 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1725
1726 delete $self->{ox};
1547 1727
1548 delete $self->{texture} 1728 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1550} 1732}
1551 1733
1552sub set_fontsize { 1734sub set_fontsize {
1553 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1554 1736
1555 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1556 delete $self->{texture}; 1739 delete $self->{texture};
1557 1740
1558 $self->realloc; 1741 $self->realloc;
1559} 1742}
1560 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1561sub _draw { 1753sub _draw {
1562 my ($self) = @_; 1754 my ($self) = @_;
1563 1755
1564 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1565 1757
1566 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1567 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1568 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1569 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1570 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1765
1574 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1766 [$self->{layout}->size]
1767 };
1575 1768
1769 unless (exists $self->{ox}) {
1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1578 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1579 1773
1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1582 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1583
1584 $tex
1585 }; 1777 };
1586 1778
1587 glEnable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1588 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1589 1781
1590 if ($tex->{format} == GL_ALPHA) { 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1591 glColor @{$self->{fg}};
1592 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1593 } else {
1594 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1595 }
1596
1597 glDisable GL_TEXTURE_2D;
1598} 1783}
1599 1784
1600############################################################################# 1785#############################################################################
1601 1786
1602package CFClient::UI::EntryBase; 1787package CFClient::UI::EntryBase;
… …
1616 can_hover => 1, 1801 can_hover => 1,
1617 can_focus => 1, 1802 can_focus => 1,
1618 valign => 0, 1803 valign => 0,
1619 can_events => 1, 1804 can_events => 1,
1620 #text => ... 1805 #text => ...
1806 #hidden => "*",
1621 @_ 1807 @_
1622 ) 1808 )
1623} 1809}
1624 1810
1625sub _set_text { 1811sub _set_text {
… …
1627 1813
1628 delete $self->{cur_h}; 1814 delete $self->{cur_h};
1629 1815
1630 return if $self->{text} eq $text; 1816 return if $self->{text} eq $text;
1631 1817
1632 delete $self->{texture};
1633
1634 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1635 $self->{text} = $text; 1819 $self->{text} = $text;
1636 1820
1637 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1638 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1639 1824
1640 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1828 $self->update;
1641} 1829}
1642 1830
1643sub set_text { 1831sub set_text {
1644 my ($self, $text) = @_; 1832 my ($self, $text) = @_;
1645 1833
1646 $self->{cursor} = length $text; 1834 $self->{cursor} = length $text;
1647 $self->_set_text ($text); 1835 $self->_set_text ($text);
1648
1649 $self->realloc;
1650} 1836}
1651 1837
1652sub get_text { 1838sub get_text {
1653 $_[0]{text} 1839 $_[0]{text}
1654} 1840}
… …
1659 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1660 1846
1661 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1662} 1848}
1663 1849
1664sub key_down { 1850sub invoke_key_down {
1665 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1666 1852
1667 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1668 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1669 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1681 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFClient::SDLK_HOME) {
1682 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1683 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFClient::SDLK_END) {
1684 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1685 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1686 $self->_emit ('escape'); 1872 $self->emit ('escape');
1687 } elsif ($uni) { 1873 } elsif ($uni) {
1688 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else {
1876 return 0;
1689 } 1877 }
1690 1878
1691 $self->_set_text ($text); 1879 $self->_set_text ($text);
1692 1880
1693 $self->realloc; 1881 $self->realloc;
1694}
1695 1882
1883 1
1884}
1885
1696sub focus_in { 1886sub invoke_focus_in {
1697 my ($self) = @_; 1887 my ($self) = @_;
1698 1888
1699 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1700 1890
1701 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1702} 1892}
1703 1893
1704sub button_down { 1894sub invoke_button_down {
1705 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1706 1896
1707 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1708 1898
1709 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1710 1900
1711 # byte-index to char-index 1901 # byte-index to char-index
1712 my $text = $self->{text}; 1902 my $text = $self->{text};
1713 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1714 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1715 1905
1716 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1717 $self->update; 1907 $self->update;
1908
1909 1
1718} 1910}
1719 1911
1720sub mouse_motion { 1912sub invoke_mouse_motion {
1721 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1722# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1915
1916 1
1723} 1917}
1724 1918
1725sub _draw { 1919sub _draw {
1726 my ($self) = @_; 1920 my ($self) = @_;
1727 1921
1728 local $self->{fg} = $self->{fg}; 1922 local $self->{fg} = $self->{fg};
1729 1923
1730 if ($FOCUS == $self) { 1924 if ($FOCUS == $self) {
1731 glColor @{$self->{active_bg}}; 1925 glColor_premultiply @{$self->{active_bg}};
1732 $self->{fg} = $self->{active_fg}; 1926 $self->{fg} = $self->{active_fg};
1733 } else { 1927 } else {
1734 glColor @{$self->{bg}}; 1928 glColor_premultiply @{$self->{bg}};
1735 } 1929 }
1736 1930
1737 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1739 glBegin GL_QUADS; 1933 glBegin GL_QUADS;
1740 glVertex 0 , 0; 1934 glVertex 0 , 0;
1741 glVertex 0 , $self->{h}; 1935 glVertex 0 , $self->{h};
1742 glVertex $self->{w}, $self->{h}; 1936 glVertex $self->{w}, $self->{h};
1743 glVertex $self->{w}, 0; 1937 glVertex $self->{w}, 0;
… …
1768 1962
1769our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFClient::UI::EntryBase::;
1770 1964
1771use CFClient::OpenGL; 1965use CFClient::OpenGL;
1772 1966
1773sub key_down { 1967sub invoke_key_down {
1774 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1775 1969
1776 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1777 1971
1778 if ($sym == 13) { 1972 if ($sym == 13) {
1779 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1780 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1781 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1782 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1783 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1784 $self->update; 1979 $self->update;
1785 1980
1786 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFClient::SDLK_UP) {
1787 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1788 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
… …
1804 } else { 1999 } else {
1805 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1806 } 2001 }
1807 2002
1808 } else { 2003 } else {
1809 $self->SUPER::key_down ($ev); 2004 return $self->SUPER::invoke_key_down ($ev)
2005 }
2006
1810 } 2007 1
1811
1812} 2008}
1813 2009
1814############################################################################# 2010#############################################################################
1815 2011
1816package CFClient::UI::Button; 2012package CFClient::UI::Button;
… …
1837 can_events => 1, 2033 can_events => 1,
1838 @_ 2034 @_
1839 ) 2035 )
1840} 2036}
1841 2037
1842sub activate { }
1843
1844sub button_up { 2038sub invoke_button_up {
1845 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1846 2040
1847 $self->emit ("activate") 2041 $self->emit ("activate")
1848 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1849 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
2044
2045 1
1850} 2046}
1851 2047
1852sub _draw { 2048sub _draw {
1853 my ($self) = @_; 2049 my ($self) = @_;
1854 2050
1855 local $self->{fg} = $self->{fg}; 2051 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1856
1857 if ($GRAB == $self) {
1858 $self->{fg} = $self->{active_fg};
1859 }
1860 2052
1861 glEnable GL_TEXTURE_2D; 2053 glEnable GL_TEXTURE_2D;
1862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1863 glColor 0, 0, 0, 1; 2055 glColor 0, 0, 0, 1;
1864 2056
… …
1901 my ($self) = @_; 2093 my ($self) = @_;
1902 2094
1903 (6) x 2 2095 (6) x 2
1904} 2096}
1905 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1906sub button_down { 2106sub invoke_button_down {
1907 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1908 2108
1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1911 $self->{state} = !$self->{state}; 2111 $self->toggle;
1912 $self->_emit (changed => $self->{state}); 2112 } else {
2113 return 0
2114 }
2115
1913 } 2116 1
1914} 2117}
1915 2118
1916sub _draw { 2119sub _draw {
1917 my ($self) = @_; 2120 my ($self) = @_;
1918 2121
… …
1938package CFClient::UI::Image; 2141package CFClient::UI::Image;
1939 2142
1940our @ISA = CFClient::UI::Base::; 2143our @ISA = CFClient::UI::Base::;
1941 2144
1942use CFClient::OpenGL; 2145use CFClient::OpenGL;
1943use Carp qw/confess/;
1944 2146
1945our %loaded_images; 2147our %texture_cache;
1946 2148
1947sub new { 2149sub new {
1948 my $class = shift; 2150 my $class = shift;
1949 2151
1950 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
1951 2156
1952 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
1953 2159
1954 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1955 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1956 2162
1957 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
1958 2164
1959 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1960
1961 $self->{aspect} = $tex->{w} / $tex->{h};
1962 2166
1963 $self 2167 $self
1964} 2168}
1965 2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
1966sub size_request { 2185sub size_request {
1967 my ($self) = @_; 2186 my ($self) = @_;
1968 2187
1969 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
1970} 2189}
1971 2190
1972sub _draw { 2191sub _draw {
1973 my ($self) = @_; 2192 my ($self) = @_;
1974 2193
… …
1984 } 2203 }
1985 2204
1986 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
1987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1988 2207
1989 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
1990 2209
1991 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
2211}
2212
2213#############################################################################
2214
2215package CFClient::UI::ImageButton;
2216
2217our @ISA = CFClient::UI::Image::;
2218
2219use CFClient::OpenGL;
2220
2221my %textures;
2222
2223sub new {
2224 my $class = shift;
2225
2226 my $self = $class->SUPER::new (
2227 padding_x => 4,
2228 padding_y => 4,
2229 fg => [1, 1, 1],
2230 active_fg => [0, 0, 1],
2231 can_hover => 1,
2232 align => 0,
2233 valign => 0,
2234 can_events => 1,
2235 @_
2236 );
2237}
2238
2239sub invoke_button_up {
2240 my ($self, $ev, $x, $y) = @_;
2241
2242 $self->emit ("activate")
2243 if $x >= 0 && $x < $self->{w}
2244 && $y >= 0 && $y < $self->{h};
2245
2246 1
1992} 2247}
1993 2248
1994############################################################################# 2249#############################################################################
1995 2250
1996package CFClient::UI::VGauge; 2251package CFClient::UI::VGauge;
… …
2083 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2084 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2085 2340
2086 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2087 my $h2 = $self->{h} * (1 - $ycut2); 2342 my $h2 = $self->{h} * (1 - $ycut2);
2343 my $h3 = $self->{h};
2344
2345 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2088 2346
2089 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2090 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2091 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
2092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2093 2352
2094 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2353 glBindTexture GL_TEXTURE_2D, $t1->{name};
2095 glBegin GL_QUADS; 2354 glBegin GL_QUADS;
… …
2110 2369
2111 if ($t3) { 2370 if ($t3) {
2112 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2113 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2114 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2115 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2116 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2117 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2118 glEnd; 2377 glEnd;
2119 } 2378 }
2120 2379
2121 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
… …
2209 $self->update; 2468 $self->update;
2210 2469
2211 $self 2470 $self
2212} 2471}
2213 2472
2214sub changed { }
2215
2216sub set_range { 2473sub set_range {
2217 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2218 2475
2219 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2220 2477
2221 $self->update
2222 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2223} 2482}
2224 2483
2225sub set_value { 2484sub set_value {
2226 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2227 2486
… …
2238 if $unit; 2497 if $unit;
2239 2498
2240 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2241 2500
2242 if ($value != $old_value) { 2501 if ($value != $old_value) {
2243 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2244 $self->update; 2503 $self->update;
2245 } 2504 }
2246} 2505}
2247 2506
2248sub size_request { 2507sub size_request {
2249 my ($self) = @_; 2508 my ($self) = @_;
2250 2509
2251 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2252} 2511}
2253 2512
2254sub button_down { 2513sub invoke_button_down {
2255 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2256 2515
2257 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2258 2517
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260 2519
2261 $self->mouse_motion ($ev, $x, $y); 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2262} 2521}
2263 2522
2264sub mouse_motion { 2523sub invoke_mouse_motion {
2265 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2266 2525
2267 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2268 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2269 2528
2270 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2529 my (undef, $lo, $hi, $page) = @{$self->{range}};
2271 2530
2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2531 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273 2532
2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2533 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2534 } else {
2535 return 0;
2536 }
2537
2275 } 2538 1
2539}
2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2276} 2549}
2277 2550
2278sub update { 2551sub update {
2279 my ($self) = @_; 2552 my ($self) = @_;
2280 2553
2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2554 delete $self->{knob_w};
2555 $self->SUPER::update;
2556}
2557
2558sub _draw {
2559 my ($self) = @_;
2560
2561 unless ($self->{knob_w}) {
2282 $self->set_value ($self->{range}[0]); 2562 $self->set_value ($self->{range}[0]);
2283 2563
2284 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2564 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100; 2565 my $range = ($hi - $page - $lo) || 1e-100;
2286 2566
… …
2292 $value = ($value - $lo) / $range; 2572 $value = ($value - $lo) / $range;
2293 $value = $value * $self->{scale} + $self->{offset}; 2573 $value = $value * $self->{scale} + $self->{offset};
2294 2574
2295 $self->{knob_x} = $value - $knob_w * 0.5; 2575 $self->{knob_x} = $value - $knob_w * 0.5;
2296 $self->{knob_w} = $knob_w; 2576 $self->{knob_w} = $knob_w;
2297 }); 2577 }
2298
2299 $self->SUPER::update;
2300}
2301
2302sub _draw {
2303 my ($self) = @_;
2304 2578
2305 $self->SUPER::_draw (); 2579 $self->SUPER::_draw ();
2306 2580
2307 glScale $self->{w}, $self->{h}; 2581 glScale $self->{w}, $self->{h};
2308 2582
… …
2369sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2370sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2371 2645
2372############################################################################# 2646#############################################################################
2373 2647
2374package CFClient::UI::TextView; 2648package CFClient::UI::TextScroller;
2375 2649
2376our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFClient::UI::HBox::;
2377 2651
2378use CFClient::OpenGL; 2652use CFClient::OpenGL;
2379 2653
2380sub new { 2654sub new {
2381 my $class = shift; 2655 my $class = shift;
2382 2656
2383 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2384 fontsize => 1, 2658 fontsize => 1,
2385 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2386 #font => default_font 2661 #font => default_font
2387 @_, 2662 @_,
2388 2663
2389 layout => (new CFClient::Layout 1), 2664 layout => (new CFClient::Layout),
2390 par => [], 2665 par => [],
2391 height => 0, 2666 height => 0,
2392 children => [ 2667 children => [
2393 (new CFClient::UI::Empty expand => 1), 2668 (new CFClient::UI::Empty expand => 1),
2394 (new CFClient::UI::Slider vertical => 1), 2669 (new CFClient::UI::Slider vertical => 1),
… …
2405 2680
2406 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2407 $self->reflow; 2682 $self->reflow;
2408} 2683}
2409 2684
2685sub size_request {
2686 my ($self) = @_;
2687
2688 my ($empty, $slider) = @{ $self->{children} };
2689
2690 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request
2692}
2693
2410sub size_allocate { 2694sub invoke_size_allocate {
2411 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2412 2696
2413 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2414 2699
2415 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2416 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2417 $self->{layout}->set_width ($self->{children}[0]{w}); 2702 $self->{layout}->set_width ($empty->{w});
2703 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2418 2704
2419 $self->reflow; 2705 $self->reflow;
2420}
2421 2706
2422sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2423 my ($self, $text, $indent) = @_; 2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2719}
2720
2721sub get_layout {
2722 my ($self, $para) = @_;
2424 2723
2425 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2426 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2427 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428 $layout->set_width ($self->{children}[0]{w} - $indent); 2729 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2730 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2429 $layout->set_markup ($text); 2731 $layout->set_markup ($para->{markup});
2732
2733 $layout->set_shapes (
2734 map
2735 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2736 @{$para->{widget}}
2430 2737 );
2738
2431 $layout->size 2739 $layout
2432} 2740}
2433 2741
2434sub reflow { 2742sub reflow {
2435 my ($self) = @_; 2743 my ($self) = @_;
2436 2744
… …
2445 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2446} 2754}
2447 2755
2448sub clear { 2756sub clear {
2449 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2450 2761
2451 $self->{par} = []; 2762 $self->{par} = [];
2452 $self->{height} = 0; 2763 $self->{height} = 0;
2453 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454} 2765}
2455 2766
2456sub add_paragraph { 2767sub add_paragraph {
2457 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2458 2769
2459 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2460 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2461 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2463 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2464 2780
2465 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para;
2783 }
2784
2785 $self->{need_reflow}++;
2786 $self->update;
2787}
2788
2789sub scroll_to_bottom {
2790 my ($self) = @_;
2791
2792 $self->{scroll_to_bottom} = 1;
2793 $self->update;
2466} 2794}
2467 2795
2468sub update { 2796sub update {
2469 my ($self) = @_; 2797 my ($self) = @_;
2470 2798
… …
2472 2800
2473 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2474 2802
2475 delete $self->{texture}; 2803 delete $self->{texture};
2476 2804
2477 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479 2807
2480 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2481 my $height = 0; 2809 my $height = 0;
2482 2810
2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2487 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2488 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2489 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2490 $layout->set_markup ($_->[4]);
2491 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2492 $_->[0] = $w + $_->[3]; 2815
2493 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2494 } 2819 }
2495 2820
2496 $height += $_->[1]; 2821 $height += $para->{h};
2497 } 2822 }
2498 2823
2499 $self->{height} = $height; 2824 $self->{height} = $height;
2500 2825
2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2502 2827
2503 delete $self->{texture}; 2828 delete $self->{texture};
2504 } 2829 }
2505 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2507 glClearColor 0.5, 0.5, 0.5, 0; 2836 glClearColor 0, 0, 0, 0;
2508 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2509 2838
2510 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2511 2840
2512 my $y0 = $top; 2841 my $y0 = $top;
2513 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2514 2843
2515 my $y = 0; 2844 my $y = 0;
2516 2845
2517 my $layout = $self->{layout};
2518
2519 $layout->set_font ($self->{font}) if $self->{font};
2520
2521 glEnable GL_BLEND;
2522 #TODO# not correct in windows where rgba is forced off
2523 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2524
2525 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2526 my $h = $par->[1]; 2847 my $h = $para->{h};
2527 2848
2528 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2529 $layout->set_foreground (@{ $par->[2] });
2530 $layout->set_width ($W - $par->[3]);
2531 $layout->set_markup ($par->[4]);
2532 2850
2533 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2534 2852
2535 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2536 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2854
2855 if (my @w = @{ $para->{widget} }) {
2856 my @s = $layout->get_shapes;
2857
2858 for (@w) {
2859 my ($dx, $dy) = splice @s, 0, 2, ();
2860
2861 $_->{x} = $dx + $para->{indent};
2862 $_->{y} = $dy + $y - $y0;
2863
2864 $_->draw;
2865 }
2866 }
2537 } 2867 }
2538 2868
2539 $y += $h; 2869 $y += $h;
2540 } 2870 }
2541
2542 glDisable GL_BLEND;
2543 }; 2871 };
2544 }); 2872 });
2545} 2873}
2546 2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2882}
2883
2547sub _draw { 2884sub _draw {
2548 my ($self) = @_; 2885 my ($self) = @_;
2549 2886
2550 glEnable GL_TEXTURE_2D; 2887 glEnable GL_TEXTURE_2D;
2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2888 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552 glColor 1, 1, 1, 1; 2889 glColor 0, 0, 0, 1;
2553 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2890 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2554 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2555 2892
2556 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2557
2558} 2894}
2559 2895
2560############################################################################# 2896#############################################################################
2561 2897
2562package CFClient::UI::Animator; 2898package CFClient::UI::Animator;
… …
2649 $tooltip .= "\n\n" . (ref $widget) . "\n" 2985 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n" 2987 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}"; 2988 . "visible $widget->{visible}";
2653 } 2989 }
2990
2991 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//;
2654 2993
2655 $self->add (new CFClient::UI::Label 2994 $self->add (new CFClient::UI::Label
2656 markup => $tooltip, 2995 markup => $tooltip,
2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2658 fontsize => 0.8, 2997 fontsize => 0.8,
… …
2668 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2669 3008
2670 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2671} 3010}
2672 3011
2673sub size_allocate { 3012sub invoke_size_allocate {
2674 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2675 3014
2676 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2677} 3016}
2678 3017
2679sub visibility_change { 3018sub invoke_visibility_change {
2680 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2681 3020
2682 return unless $visible; 3021 return unless $visible;
2683 3022
2684 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2685 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2686 or return; 3025 or return;
2687 3026
3027 if ($widget->{visible}) {
2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689 3029
2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691 if $x + $self->{w} > $::WIDTH; 3031 if $x + $self->{w} > $self->{root}{w};
2692 3032
2693 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2694 }); 3037 });
2695} 3038}
2696 3039
2697sub _draw { 3040sub _draw {
2698 my ($self) = @_; 3041 my ($self) = @_;
… …
2724 3067
2725############################################################################# 3068#############################################################################
2726 3069
2727package CFClient::UI::Face; 3070package CFClient::UI::Face;
2728 3071
2729our @ISA = CFClient::UI::Base::; 3072our @ISA = CFClient::UI::DrawBG::;
2730 3073
2731use CFClient::OpenGL; 3074use CFClient::OpenGL;
2732 3075
2733sub new { 3076sub new {
2734 my $class = shift; 3077 my $class = shift;
… …
2771sub _draw { 3114sub _draw {
2772 my ($self) = @_; 3115 my ($self) = @_;
2773 3116
2774 return unless $::CONN; 3117 return unless $::CONN;
2775 3118
3119 $self->SUPER::_draw;
3120
2776 my $face; 3121 my $face;
2777 3122
2778 if ($self->{frame}) { 3123 if ($self->{frame}) {
2779 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2780 3125
… …
2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2786 3131
2787 if ($tex) { 3132 if ($tex) {
2788 glEnable GL_TEXTURE_2D; 3133 glEnable GL_TEXTURE_2D;
2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2790 glColor 1, 1, 1, 1; 3135 glColor 0, 0, 0, 1;
2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2792 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2793 } 3138 }
2794} 3139}
2795 3140
2796sub DESTROY { 3141sub destroy {
2797 my ($self) = @_; 3142 my ($self) = @_;
2798 3143
2799 $self->{timer}->cancel 3144 $self->{timer}->cancel
2800 if $self->{timer}; 3145 if $self->{timer};
2801 3146
2802 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2803} 3148}
3149
3150#############################################################################
3151
3152package CFClient::UI::Buttonbar;
3153
3154our @ISA = CFClient::UI::HBox::;
3155
3156# TODO: should actualyl wrap buttons and other goodies.
2804 3157
2805############################################################################# 3158#############################################################################
2806 3159
2807package CFClient::UI::Menu; 3160package CFClient::UI::Menu;
2808 3161
… …
2820 ); 3173 );
2821 3174
2822 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2823 3176
2824 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2825 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2826 3179
2827 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2828 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
3185 $widget = new CFClient::UI::HBox
3186 can_hover => 1,
3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
2829 $widget = new CFClient::UI::Label 3196 $widget = new CFClient::UI::Label
2830 can_hover => 1, 3197 can_hover => 1,
2831 can_events => 1, 3198 can_events => 1,
2832 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2833 } 3202 }
2834 3203
2835 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2836 3205
2837 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2842 3211
2843# popup given the event (must be a mouse button down event currently) 3212# popup given the event (must be a mouse button down event currently)
2844sub popup { 3213sub popup {
2845 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2846 3215
2847 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2848 3217
2849 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2850 $GRAB = $self; 3219 $GRAB = $self;
2851 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2852 3221
2853 $self->show; 3222 $self->show;
2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3223 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2855} 3224}
2856 3225
2857sub mouse_motion { 3226sub invoke_mouse_motion {
2858 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2859 3228
2860 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2861 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2862 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2863}
2864 3232
3233 0
3234}
3235
2865sub button_up { 3236sub invoke_button_up {
2866 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2867 3238
2868 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2869 undef $GRAB; 3240 undef $GRAB;
2870 $self->hide; 3241 $self->hide;
2871 3242
2872 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2873 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
3245 } else {
3246 return 0
3247 }
3248
2874 } 3249 1
2875} 3250}
2876 3251
2877############################################################################# 3252#############################################################################
2878 3253
2879package CFClient::UI::Statusbox; 3254package CFClient::UI::Multiplexer;
2880 3255
2881our @ISA = CFClient::UI::VBox::; 3256our @ISA = CFClient::UI::Container::;
2882 3257
2883sub new { 3258sub new {
2884 my $class = shift; 3259 my $class = shift;
2885 3260
2886 $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
3262 @_,
3263 );
3264
3265 $self->{current} = $self->{children}[0]
3266 if @{ $self->{children} };
3267
3268 $self
3269}
3270
3271sub add {
3272 my ($self, @widgets) = @_;
3273
3274 $self->SUPER::add (@widgets);
3275
3276 $self->{current} = $self->{children}[0]
3277 if @{ $self->{children} };
3278}
3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
3286sub set_current_page {
3287 my ($self, $page_or_widget) = @_;
3288
3289 my $widget = ref $page_or_widget
3290 ? $page_or_widget
3291 : $self->{children}[$page_or_widget];
3292
3293 $self->{current} = $widget;
3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3295
3296 $self->emit (page_changed => $self->{current});
3297
3298 $self->realloc;
3299}
3300
3301sub visible_children {
3302 $_[0]{current}
3303}
3304
3305sub size_request {
3306 my ($self) = @_;
3307
3308 $self->{current}->size_request
3309}
3310
3311sub invoke_size_allocate {
3312 my ($self, $w, $h) = @_;
3313
3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3317}
3318
3319sub _draw {
3320 my ($self) = @_;
3321
3322 $self->{current}->draw;
3323}
3324
3325#############################################################################
3326
3327package CFClient::UI::Notebook;
3328
3329our @ISA = CFClient::UI::VBox::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 buttonbar => (new CFClient::UI::Buttonbar),
3336 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3337 # filter => # will be put between multiplexer and $self
3338 @_,
3339 );
3340
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3342 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3343
3344 $self
3345}
3346
3347sub add {
3348 my ($self, $title, $widget, $tooltip) = @_;
3349
3350 Scalar::Util::weaken $self;
3351
3352 $self->{buttonbar}->add (new CFClient::UI::Button
3353 markup => $title,
3354 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) },
3356 );
3357
3358 $self->{multiplexer}->add ($widget);
3359}
3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3367sub set_current_page {
3368 my ($self, $page) = @_;
3369
3370 $self->{multiplexer}->set_current_page ($page);
3371 $self->emit (page_changed => $self->{multiplexer}{current});
3372}
3373
3374#############################################################################
3375
3376package CFClient::UI::Selector;
3377
3378use utf8;
3379
3380our @ISA = CFClient::UI::Button::;
3381
3382sub new {
3383 my $class = shift;
3384
3385 my $self = $class->SUPER::new (
3386 options => [], # [value, title, longdesc], ...
3387 value => undef,
3388 @_,
3389 );
3390
3391 $self->_set_value ($self->{value});
3392
3393 $self
3394}
3395
3396sub invoke_button_down {
3397 my ($self, $ev) = @_;
3398
3399 my @menu_items;
3400
3401 for (@{ $self->{options} }) {
3402 my ($value, $title, $tooltip) = @$_;
3403
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 }
3406
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408}
3409
3410sub _set_value {
3411 my ($self, $value) = @_;
3412
3413 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3414 or return;
3415
3416 $self->{value} = $item->[0];
3417 $self->set_markup ("$item->[1] ⇓");
3418 $self->set_tooltip ($item->[2]);
3419}
3420
3421sub set_value {
3422 my ($self, $value) = @_;
3423
3424 return unless $self->{value} ne $value;
3425
3426 $self->_set_value ($value);
3427 $self->emit (changed => $value);
3428}
3429
3430#############################################################################
3431
3432package CFClient::UI::Statusbox;
3433
3434our @ISA = CFClient::UI::VBox::;
3435
3436sub new {
3437 my $class = shift;
3438
3439 my $self = $class->SUPER::new (
2887 fontsize => 0.8, 3440 fontsize => 0.8,
2888 @_, 3441 @_,
2889 ) 3442 );
3443
3444 Scalar::Util::weaken (my $this = $self);
3445
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447
3448 $self
2890} 3449}
2891 3450
2892sub reorder { 3451sub reorder {
2893 my ($self) = @_; 3452 my ($self) = @_;
2894 my $NOW = time; 3453 my $NOW = Time::HiRes::time;
3454
3455 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} };
2895 3459
2896 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
2897 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2898 } 3462 }
2899 3463
… …
2902 my @items = sort { 3466 my @items = sort {
2903 $a->{pri} <=> $b->{pri} 3467 $a->{pri} <=> $b->{pri}
2904 or $b->{id} <=> $a->{id} 3468 or $b->{id} <=> $a->{id}
2905 } values %{ $self->{item} }; 3469 } values %{ $self->{item} };
2906 3470
3471 $self->{timer}->interval (1);
3472
2907 my $count = 10 + 1; 3473 my $count = 10 + 1;
2908 for my $item (@items) { 3474 for my $item (@items) {
2909 last unless --$count; 3475 last unless --$count;
2910 3476
2911 push @widgets, $item->{label} ||= do { 3477 my $label = $item->{label} ||= do {
2912 # TODO: doesn't handle markup well (read as: at all) 3478 # TODO: doesn't handle markup well (read as: at all)
2913 my $short = $item->{count} > 1 3479 my $short = $item->{count} > 1
2914 ? "<b>$item->{count} ×</b> $item->{text}" 3480 ? "<b>$item->{count} ×</b> $item->{text}"
2915 : $item->{text}; 3481 : $item->{text};
2916 3482
… …
2924 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
2925 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
2926 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
2927 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
2928 max_w => $::WIDTH * 0.44, 3494 max_w => $::WIDTH * 0.44,
2929 fg => $item->{fg}, 3495 fg => [@{ $item->{fg} }],
2930 can_events => 1, 3496 can_events => 1,
2931 can_hover => 1 3497 can_hover => 1
2932 }; 3498 };
3499
3500 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3501 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3502 $label->update;
3503 $label->set_max_size (undef, $label->{req_h} * $diff)
3504 if $diff < 1;
3505 $self->{timer}->interval (1/30);
3506 } else {
3507 $label->{fg}[3] = $item->{fg}[3] || 1;
3508 }
3509
3510 push @widgets, $label;
2933 } 3511 }
2934 3512
2935 $self->clear; 3513 $self->clear;
2936 $self->SUPER::add (reverse @widgets); 3514 $self->SUPER::add (reverse @widgets);
2937} 3515}
… …
2942 $text =~ s/^\s+//; 3520 $text =~ s/^\s+//;
2943 $text =~ s/\s+$//; 3521 $text =~ s/\s+$//;
2944 3522
2945 return unless $text; 3523 return unless $text;
2946 3524
2947 my $timeout = time + ((delete $arg{timeout}) || 60); 3525 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2948 3526
2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3527 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2950 3528
2951 if (my $item = $self->{item}{$group}) { 3529 if (my $item = $self->{item}{$group}) {
2952 if ($item->{text} eq $text) { 3530 if ($item->{text} eq $text) {
2953 $item->{count}++; 3531 $item->{count}++;
2954 } else { 3532 } else {
2955 $item->{count} = 1; 3533 $item->{count} = 1;
2956 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
2957 } 3535 }
2958 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
2959 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
2960 delete $item->{label}; 3538 delete $item->{label};
2961 } else { 3539 } else {
2962 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
2963 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
2969 count => 1, 3547 count => 1,
2970 %arg, 3548 %arg,
2971 }; 3549 };
2972 } 3550 }
2973 3551
3552 $ROOT->on_refresh (reorder => sub {
2974 $self->reorder; 3553 $self->reorder;
3554 });
2975} 3555}
2976 3556
2977sub reconfigure { 3557sub reconfigure {
2978 my ($self) = @_; 3558 my ($self) = @_;
2979 3559
… …
2982 3562
2983 $self->reorder; 3563 $self->reorder;
2984 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
2985} 3565}
2986 3566
3567sub destroy {
3568 my ($self) = @_;
3569
3570 $self->{timer}->cancel;
3571
3572 $self->SUPER::destroy;
3573}
3574
2987############################################################################# 3575#############################################################################
2988 3576
2989package CFClient::UI::Inventory; 3577package CFClient::UI::Inventory;
2990 3578
2991our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFClient::UI::Table::;
2992 3580
2993sub new { 3581sub new {
2994 my $class = shift; 3582 my $class = shift;
2995 3583
2996 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
2998 @_, 3587 @_,
2999 ); 3588 );
3000 3589
3590 $self->set_sort_order (undef);
3591
3001 $self 3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3002} 3628}
3003 3629
3004sub set_items { 3630sub set_items {
3005 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3006 3632
3007 $self->{scrolled}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3008 return unless $items; 3634 $self->update_items;
3009
3010 my @items = sort {
3011 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name})
3013 } @$items;
3014
3015 $self->{real_items} = \@items;
3016
3017 my $row = 0;
3018 for my $item (@items) {
3019 CFClient::Item::update_widgets $item;
3020
3021 $self->{scrolled}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3024
3025 $row++;
3026 }
3027} 3635}
3028 3636
3029############################################################################# 3637#############################################################################
3030 3638
3031package CFClient::UI::BindEditor; 3639package CFClient::UI::SpellList;
3032 3640
3033our @ISA = CFClient::UI::FancyFrame::; 3641our @ISA = CFClient::UI::Table::;
3034 3642
3035sub new { 3643sub new {
3036 my $class = shift; 3644 my $class = shift;
3037 3645
3038 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3039 3652
3040 $self->add (my $vb = new CFClient::UI::VBox); 3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3041 3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3042 3665
3043 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3666sub rebuild_spell_list {
3044 text => "start recording", 3667 my ($self) = @_;
3045 tooltip => "Start/Stops recording of actions." 3668
3046 ."All subsequent actions after the recording started will be captured." 3669 $CFClient::UI::ROOT->on_refresh ($self => sub {
3047 ."The actions are displayed after the record was stopped." 3670 $self->clear;
3048 ."To bind the action you have to click on the 'Bind' button", 3671
3049 on_activate => sub { 3672 return unless $::CONN;
3050 unless ($self->{recording}) { 3673
3051 $self->start; 3674 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFClient::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3052 } else { 3701 } else {
3053 $self->stop; 3702 return 0;
3703 }
3704
3705 1
3054 } 3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFClient::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFClient::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3055 }); 3734 }
3056
3057 $vb->add (new CFClient::UI::Label text => "Actions:");
3058 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3061 $vb->add (my $hb = new CFClient::UI::HBox);
3062 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063 $hb->add (new CFClient::UI::Button
3064 text => "bind",
3065 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066 on_activate => sub {
3067 $self->ask_for_bind;
3068 });
3069
3070 $vb->add (my $hb = new CFClient::UI::HBox);
3071 $hb->add (new CFClient::UI::Button
3072 text => "ok",
3073 expand => 1,
3074 tooltip => "This closes the binding editor and saves the binding",
3075 on_activate => sub {
3076 $self->hide;
3077 $self->commit;
3078 });
3079
3080 $hb->add (new CFClient::UI::Button
3081 text => "cancel",
3082 expand => 1,
3083 tooltip => "This closes the binding editor without saving",
3084 on_activate => sub {
3085 $self->hide;
3086 $self->{binding_cancel}->()
3087 if $self->{binding_cancel};
3088 });
3089
3090 $self->update_binding_widgets;
3091
3092 $self
3093}
3094
3095sub commit {
3096 my ($self) = @_;
3097 my ($mod, $sym, $cmds) = $self->get_binding;
3098 if ($sym != 0 && @$cmds > 0) {
3099 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100 ."'. Don't forget 'Save Config'!");
3101 $self->{binding_change}->($mod, $sym, $cmds)
3102 if $self->{binding_change};
3103 } else {
3104 $::STATUSBOX->add ("No action bound, no key or action specified!");
3105 $self->{binding_cancel}->()
3106 if $self->{binding_cancel};
3107 }
3108}
3109
3110sub start {
3111 my ($self) = @_;
3112
3113 $self->{rec_btn}->set_text ("stop recording");
3114 $self->{recording} = 1;
3115 $self->clear_command_list;
3116 $::CONN->start_record if $::CONN;
3117}
3118
3119sub stop {
3120 my ($self) = @_;
3121
3122 $self->{rec_btn}->set_text ("start recording");
3123 $self->{recording} = 0;
3124
3125 my $rec;
3126 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec);
3129}
3130
3131# if $commit is true, the binding will be set after the user entered a key combo
3132sub ask_for_bind {
3133 my ($self, $commit) = @_;
3134
3135 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_;
3137 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138 $self->update_binding_widgets;
3139 $self->commit if $commit;
3140 }); 3735 });
3141} 3736}
3142 3737
3143# $mod and $sym are the modifiers and key symbol
3144# $cmds is a array ref of strings (the commands)
3145# $cb is the callback that is executed on OK
3146# $ccb is the callback that is executed on CANCEL and
3147# when the binding was unsuccessful on OK
3148sub set_binding {
3149 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3150
3151 $self->clear_command_list;
3152 $self->{recording} = 0;
3153 $self->{rec_btn}->set_text ("start recording");
3154
3155 $self->{binding} = [$mod, $sym];
3156 $self->{commands} = $cmds;
3157
3158 $self->{binding_change} = $cb;
3159 $self->{binding_cancel} = $ccb;
3160
3161 $self->update_binding_widgets;
3162}
3163
3164# this is a shortcut method that asks for a binding
3165# and then just binds it.
3166sub do_quick_binding {
3167 my ($self, $cmds) = @_;
3168 $self->set_binding (undef, undef, $cmds, sub {
3169 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170 });
3171 $self->ask_for_bind (1);
3172}
3173
3174sub update_binding_widgets {
3175 my ($self) = @_;
3176 my ($mod, $sym, $cmds) = $self->get_binding;
3177 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178 $self->set_command_list ($cmds);
3179}
3180
3181sub get_binding {
3182 my ($self) = @_;
3183 return (
3184 $self->{binding}->[0],
3185 $self->{binding}->[1],
3186 [ grep { defined $_ } @{$self->{commands}} ]
3187 );
3188}
3189
3190sub clear_command_list {
3191 my ($self) = @_;
3192 $self->{cmdbox}->clear ();
3193}
3194
3195sub set_command_list {
3196 my ($self, $cmds) = @_;
3197
3198 $self->{cmdbox}->clear ();
3199 $self->{commands} = $cmds;
3200
3201 my $idx = 0;
3202
3203 for (@$cmds) {
3204 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206 my $i = $idx;
3207 $hb->add (new CFClient::UI::Label text => $_);
3208 $hb->add (new CFClient::UI::Button
3209 text => "delete",
3210 tooltip => "Deletes the action from the record",
3211 on_activate => sub {
3212 $self->{cmdbox}->remove ($hb);
3213 $cmds->[$i] = undef;
3214 });
3215
3216
3217 $idx++
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::SpellList;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (new CFClient::UI::ScrolledWindow
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235 $self;
3236}
3237
3238# XXX: Do sorting? Argl...
3239sub add_spell { 3738sub add_spell {
3240 my ($self, $spell) = @_; 3739 my ($self, $spell) = @_;
3740
3241 $self->{spells}->{$spell->{name}} = $spell; 3741 $self->{spell}->{$spell->{name}} = $spell;
3242 3742 $self->rebuild_spell_list;
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270} 3743}
3271 3744
3272sub remove_spell { 3745sub remove_spell {
3273 my ($self, $spell) = @_; 3746 my ($self, $spell) = @_;
3747
3274 delete $self->{spells}->{$spell->{name}}; 3748 delete $self->{spell}->{$spell->{name}};
3275 $self->rebuild_spell_list; 3749 $self->rebuild_spell_list;
3276} 3750}
3277 3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3278############################################################################# 3759#############################################################################
3279 3760
3280package CFClient::UI::Root; 3761package CFClient::UI::Root;
3281 3762
3282our @ISA = CFClient::UI::Container::; 3763our @ISA = CFClient::UI::Container::;
3764
3765use List::Util qw(min max);
3283 3766
3284use CFClient::OpenGL; 3767use CFClient::OpenGL;
3285 3768
3286sub new { 3769sub new {
3287 my $class = shift; 3770 my $class = shift;
… …
3314 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3315 3798
3316 int $coord + 0.5 3799 int $coord + 0.5
3317} 3800}
3318 3801
3319sub size_allocate { 3802sub invoke_size_allocate {
3320 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3321 3804
3322 for my $child ($self->children) { 3805 for my $child ($self->children) {
3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3806 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3324 3807
… …
3328 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3329 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3330 3813
3331 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3332 } 3815 }
3816
3817 1
3333} 3818}
3334 3819
3335sub coord2local { 3820sub coord2local {
3336 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3337 3822
… …
3422 3907
3423 delete $queue{$widget+0}; 3908 delete $queue{$widget+0};
3424 3909
3425 my ($w, $h) = $widget->size_request; 3910 my ($w, $h) = $widget->size_request;
3426 3911
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3912 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3913 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3914
3915 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3916 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3429 3917
3430 $w = $widget->{force_w} if exists $widget->{force_w}; 3918 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h}; 3919 $h = $widget->{force_h} if exists $widget->{force_h};
3432 3920
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3921 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3459 3947
3460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3461 3949
3462 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3463 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3952
3953 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h;
3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3464 3961
3465 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3466 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3467 3964
3468 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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