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.261 by elmex, Tue May 30 14:45:56 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 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 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
81 83
82sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
83 my ($ev) = @_; 85 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
85 87
88 warn "button down $ev->{button}\n";#d#
89
86 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
87 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
88 92
89 $GRAB = $widget; 93 $GRAB = $widget;
90 $GRAB->update if $GRAB; 94 $GRAB->update if $GRAB;
91 95
92 check_tooltip; 96 $TOOLTIP_WATCHER->cb->();
93 } 97 }
94 98
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 99 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 100
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 116 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 117 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 118 $grab->update if $grab;
115 $GRAB->update if $GRAB; 119 $GRAB->update if $GRAB;
116 120
117 check_tooltip; 121 $TOOLTIP_WATCHER->cb->();
118 } 122 }
119} 123}
120 124
121sub feed_sdl_motion_event { 125sub feed_sdl_motion_event {
122 my ($ev) = @_; 126 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 132 my $hover = $HOVER; $HOVER = $widget;
129 133
130 $hover->update if $hover && $hover->{can_hover}; 134 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 135 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 136
133 check_tooltip; 137 $TOOLTIP_WATCHER->start;
134 } 138 }
135 139
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 141 if $HOVER;
138} 142}
… …
170sub rescale_widgets { 174sub rescale_widgets {
171 my ($sx, $sy) = @_; 175 my ($sx, $sy) = @_;
172 176
173 for my $widget (values %WIDGET) { 177 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 178 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 179 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 180 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 181
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 182 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 183 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 184 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 185 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 186 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 187 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 188
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 189 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 190 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 191
188 } 192 }
189 } 193 }
190 194
191 reconfigure_widgets; 195 reconfigure_widgets;
… …
270 274
271 return unless $self->{visible}; 275 return unless $self->{visible};
272 276
273 $_->set_invisible for $self->children; 277 $_->set_invisible for $self->children;
274 278
279 delete $self->{visible};
275 delete $self->{root}; 280 delete $self->{root};
276 delete $self->{visible};
277 281
278 undef $GRAB if $GRAB == $self; 282 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 283 undef $HOVER if $HOVER == $self;
280 284
281 CFClient::UI::check_tooltip 285 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 286 if $TOOLTIP->{owner} == $self;
283 287
284 $self->focus_out; 288 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 289 $self->emit (visibility_change => 0);
287} 290}
288 291
289sub set_visibility { 292sub set_visibility {
290 my ($self, $visible) = @_; 293 my ($self, $visible) = @_;
… …
313} 316}
314 317
315sub move_abs { 318sub move_abs {
316 my ($self, $x, $y, $z) = @_; 319 my ($self, $x, $y, $z) = @_;
317 320
318 $self->{x} = List::Util::max 0, int $x; 321 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 322 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 323 $self->{z} = $z if defined $z;
321 324
322 $self->update; 325 $self->update;
323} 326}
324 327
… …
332} 335}
333 336
334sub size_request { 337sub size_request {
335 require Carp; 338 require Carp;
336 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
340}
341
342sub baseline_shift {
343 0
337} 344}
338 345
339sub configure { 346sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
341 348
… …
365 372
366 $self->{root}{size_alloc}{$self+0} = $self; 373 $self->{root}{size_alloc}{$self+0} = $self;
367 } 374 }
368} 375}
369 376
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 377sub children {
378 # nop
379}
380
381sub visible_children {
382 $_[0]->children
375} 383}
376 384
377sub set_max_size { 385sub set_max_size {
378 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
379 387
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 388 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 389 $self->{max_h} = int $h if defined $h;
390
391 $self->realloc;
382} 392}
383 393
384sub set_tooltip { 394sub set_tooltip {
385 my ($self, $tooltip) = @_; 395 my ($self, $tooltip) = @_;
386 396
… …
391 401
392 $self->{tooltip} = $tooltip; 402 $self->{tooltip} = $tooltip;
393 403
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 404 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 405 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 406 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 407 }
398} 408}
399 409
400# translate global coordinates to local coordinate system 410# translate global coordinates to local coordinate system
401sub coord2local { 411sub coord2local {
… …
409 my ($self, $x, $y) = @_; 419 my ($self, $x, $y) = @_;
410 420
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 422}
413 423
414sub focus_in { 424sub invoke_focus_in {
415 my ($self) = @_; 425 my ($self) = @_;
416 426
417 return if $FOCUS == $self; 427 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
419 429
420 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
421 431
422 $self->_emit (focus_in => $focus); 432 $self->update;
423 433
424 $focus->update if $focus; 434 0
425 $FOCUS->update;
426} 435}
427 436
428sub focus_out { 437sub invoke_focus_out {
429 my ($self) = @_; 438 my ($self) = @_;
430 439
431 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
432 441
433 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
434 443
435 $self->_emit (focus_out => $focus); 444 $self->update;
436 445
437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 447 unless $FOCUS;
441}
442 448
449 0
450}
451
452sub grab_focus {
453 my ($self) = @_;
454
455 $FOCUS->emit ("focus_out") if $FOCUS;
456 $self->emit ("focus_in");
457}
458
443sub mouse_motion { } 459sub invoke_mouse_motion { 0 }
444sub button_up { } 460sub invoke_button_up { 0 }
445sub key_down { } 461sub invoke_key_down { 0 }
446sub key_up { } 462sub invoke_key_up { 0 }
447 463
448sub button_down { 464sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
450 466
451 $self->focus_in; 467 $self->grab_focus;
452}
453 468
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 469 warn "button down $ev->{button} $x $y\n";#d#
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 470
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 471 0
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 472}
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 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 #d##TODO# stop propagating at first true, do not use sum
484 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
485 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
487}
459 488
460sub find_widget { 489sub find_widget {
461 my ($self, $x, $y) = @_; 490 my ($self, $x, $y) = @_;
462 491
463 return () unless $self->{can_events}; 492 return () unless $self->{can_events};
… …
472sub set_parent { 501sub set_parent {
473 my ($self, $parent) = @_; 502 my ($self, $parent) = @_;
474 503
475 Scalar::Util::weaken ($self->{parent} = $parent); 504 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 505 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500} 506}
501 507
502sub realloc { 508sub realloc {
503 my ($self) = @_; 509 my ($self) = @_;
504 510
… …
525 531
526 $self->realloc; 532 $self->realloc;
527 $self->update; 533 $self->update;
528} 534}
529 535
536# using global variables seems a bit hacky, but passing through all drawing
537# functions seems pointless.
538our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
539
530sub draw { 540sub draw {
531 my ($self) = @_; 541 my ($self) = @_;
532 542
533 return unless $self->{h} && $self->{w}; 543 return unless $self->{h} && $self->{w};
544
545 # update screen rectangle
546 local $draw_x = $draw_x + $self->{x};
547 local $draw_y = $draw_y + $self->{y};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 552
535 glPushMatrix; 553 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 555
540 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 558 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 560 glBegin GL_QUADS;
547 glVertex $x , $y; 561 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
551 glEnd; 565 glEnd;
552 glDisable GL_BLEND; 566 glDisable GL_BLEND;
553 } 567 }
554 568
555 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 570 glPushMatrix;
557 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 574 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
564 glEnd; 578 glEnd;
565 glPopMatrix; 579 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
568} 585}
569 586
570sub _draw { 587sub _draw {
571 my ($self) = @_; 588 my ($self) = @_;
572 589
… …
574} 591}
575 592
576sub DESTROY { 593sub DESTROY {
577 my ($self) = @_; 594 my ($self) = @_;
578 595
596 return if CFClient::in_destruct;
597
579 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
580 #$self->deactivate; 599
600 eval { $self->destroy };
601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 602}
582 603
583############################################################################# 604#############################################################################
584 605
585package CFClient::UI::DrawBG; 606package CFClient::UI::DrawBG;
… …
610 631
611 if ($color && (@$color < 4 || $color->[3])) { 632 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 633 my ($w, $h) = @$self{qw(w h)};
613 634
614 glEnable GL_BLEND; 635 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 636 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 637 glColor_premultiply @$color;
617 638
618 glBegin GL_QUADS; 639 glBegin GL_QUADS;
619 glVertex 0 , 0; 640 glVertex 0 , 0;
620 glVertex 0 , $h; 641 glVertex 0 , $h;
621 glVertex $w, $h; 642 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 673our @ISA = CFClient::UI::Base::;
653 674
654sub new { 675sub new {
655 my ($class, %arg) = @_; 676 my ($class, %arg) = @_;
656 677
657 my $children = delete $arg{children} || []; 678 my $children = delete $arg{children};
658 679
659 my $self = $class->SUPER::new ( 680 my $self = $class->SUPER::new (
660 children => [], 681 children => [],
661 can_events => 0, 682 can_events => 0,
662 %arg, 683 %arg,
663 ); 684 );
685
664 $self->add ($_) for @$children; 686 $self->add (@$children)
687 if $children;
665 688
666 $self 689 $self
667} 690}
668 691
669sub add { 692sub add {
… …
717 $x -= $self->{x}; 740 $x -= $self->{x};
718 $y -= $self->{y}; 741 $y -= $self->{y};
719 742
720 my $res; 743 my $res;
721 744
722 for (reverse @{ $self->{children} }) { 745 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 746 $res = $_->find_widget ($x, $y)
724 and return $res; 747 and return $res;
725 } 748 }
726 749
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 750 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748} 771}
749 772
750sub add { 773sub add {
751 my ($self, $child) = @_; 774 my ($self, $child) = @_;
752 775
753 $self->{children} = []; 776 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 777 $self->SUPER::add ($child);
756} 778}
757 779
758sub remove { 780sub remove {
759 my ($self, $widget) = @_; 781 my ($self, $widget) = @_;
… …
768 790
769sub size_request { 791sub size_request {
770 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
771} 793}
772 794
773sub size_allocate { 795sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
775 797
776 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
777} 801}
778 802
779############################################################################# 803#############################################################################
804
805# back-buffered drawing area
780 806
781package CFClient::UI::Window; 807package CFClient::UI::Window;
782 808
783our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
784 810
… …
795 821
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 823 $self->SUPER::update;
798} 824}
799 825
800sub size_allocate { 826sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
802 828
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 829 $self->update;
830
831 $self->SUPER::invoke_size_allocate ($w, $h)
805} 832}
806 833
807sub _render { 834sub _render {
835 my ($self) = @_;
836
808 $_[0]{children}[0]->draw; 837 $self->{children}[0]->draw;
809} 838}
810 839
811sub render_child { 840sub render_child {
812 my ($self) = @_; 841 my ($self) = @_;
813 842
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 843 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 844 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 845 glClear GL_COLOR_BUFFER_BIT;
817 846
847 {
848 package CFClient::UI::Base;
849
850 ($draw_x, $draw_y, $draw_w, $draw_h) =
851 (0, 0, $self->{w}, $self->{h});
852 }
853
818 $self->_render; 854 $self->_render;
819 }; 855 };
820} 856}
821 857
822sub _draw { 858sub _draw {
823 my ($self) = @_; 859 my ($self) = @_;
824 860
825 my ($w, $h) = ($self->w, $self->h); 861 my ($w, $h) = @$self{qw(w h)};
826 862
827 my $tex = $self->{texture} 863 my $tex = $self->{texture}
828 or return; 864 or return;
829 865
830 glEnable GL_TEXTURE_2D; 866 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 868 glColor 0, 0, 0, 1;
833 869
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 871
836 glDisable GL_TEXTURE_2D; 872 glDisable GL_TEXTURE_2D;
837} 873}
… …
861 $h = 10 if $self->{scroll_y}; 897 $h = 10 if $self->{scroll_y};
862 898
863 ($w, $h) 899 ($w, $h)
864} 900}
865 901
866sub size_allocate { 902sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
868 904
869 my $child = $self->child; 905 my $child = $self->child;
870 906
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 907 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 908 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 909
874 $self->child->configure (0, 0, $w, $h); 910 $self->child->configure (0, 0, $w, $h);
875 $self->update; 911 $self->update;
912
913 1
876} 914}
877 915
878sub set_offset { 916sub set_offset {
879 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
880 918
… …
913} 951}
914 952
915sub _render { 953sub _render {
916 my ($self) = @_; 954 my ($self) = @_;
917 955
956 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
957 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
958
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 959 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 960
920 $self->SUPER::_render; 961 $self->SUPER::_render;
921} 962}
922 963
… …
925package CFClient::UI::ScrolledWindow; 966package CFClient::UI::ScrolledWindow;
926 967
927our @ISA = CFClient::UI::HBox::; 968our @ISA = CFClient::UI::HBox::;
928 969
929sub new { 970sub new {
930 my $class = shift; 971 my ($class, %arg) = @_;
972
973 my $child = delete $arg{child};
931 974
932 my $self; 975 my $self;
933 976
934 my $slider = new CFClient::UI::Slider 977 my $slider = new CFClient::UI::Slider
935 vertical => 1, 978 vertical => 1,
… …
940 ; 983 ;
941 984
942 $self = $class->SUPER::new ( 985 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 986 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 987 slider => $slider,
945 @_, 988 %arg,
946 ); 989 );
947 990
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 991 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child;
951 993
952 $self 994 $self
953} 995}
954 996
997#TODO# update range on size_allocate depending on child
998
999sub add {
1000 my ($self, $widget) = @_;
1001
1002 $self->{vp}->add ($self->{child} = $widget);
1003}
1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
955sub update { 1019sub update {
956 my ($self) = @_; 1020 my ($self) = @_;
957 1021
958 $self->SUPER::update; 1022 $self->SUPER::update;
959 1023
960 # todo: overwrite size_allocate of child 1024 $self->update_slider;
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1025}
964 1026
965sub size_allocate { 1027sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1028 my ($self, $w, $h) = @_;
967 1029
1030 $self->update_slider;
1031
968 $self->SUPER::size_allocate ($w, $h); 1032 $self->SUPER::invoke_size_allocate ($w, $h)
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972} 1033}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1034
977############################################################################# 1035#############################################################################
978 1036
979package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
980 1038
… …
996 1054
997 if ($self->{bg}) { 1055 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1056 my ($w, $h) = @$self{qw(w h)};
999 1057
1000 glEnable GL_BLEND; 1058 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1060 glColor_premultiply @{ $self->{bg} };
1003 1061
1004 glBegin GL_QUADS; 1062 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1063 glVertex 0 , 0;
1006 glVertex 0 , $h; 1064 glVertex 0 , $h;
1007 glVertex $w, $h; 1065 glVertex $w, $h;
… …
1029my @border = 1087my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1089 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1090
1033sub new { 1091sub new {
1034 my $class = shift; 1092 my ($class, %arg) = @_;
1035 1093
1036 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1097 border => 0.6,
1040 can_events => 1, 1098 can_events => 1,
1041 min_w => 16, 1099 min_w => 64,
1042 min_h => 16, 1100 min_h => 32,
1043 @_ 1101 %arg,
1044 ); 1102 );
1045 1103
1046 $self->{title} &&= new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1105 align => 0,
1048 valign => 1, 1106 valign => 1,
1049 text => $self->{title}, 1107 text => $self->{title},
1050 fontsize => $self->{border}; 1108 fontsize => $self->{border},
1109 if exists $self->{title};
1110
1111 if ($self->{has_close_button}) {
1112 $self->{close_button} =
1113 new CFClient::UI::ImageButton
1114 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") };
1116
1117 $self->CFClient::UI::Container::add ($self->{close_button});
1118 }
1051 1119
1052 $self 1120 $self
1121}
1122
1123sub add {
1124 my ($self, @widgets) = @_;
1125
1126 $self->SUPER::add (@widgets);
1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1128 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1129}
1054 1130
1055sub border { 1131sub border {
1056 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
1057} 1133}
1058 1134
1059sub size_request { 1135sub size_request {
1060 my ($self) = @_; 1136 my ($self) = @_;
1137
1138 $self->{title_widget}->size_request
1139 if $self->{title_widget};
1140
1141 $self->{close_button}->size_request
1142 if $self->{close_button};
1061 1143
1062 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
1063 1145
1064 ( 1146 (
1065 $w + $self->border * 2, 1147 $w + $self->border * 2,
1066 $h + $self->border * 2, 1148 $h + $self->border * 2,
1067 ) 1149 )
1068} 1150}
1069 1151
1070sub size_allocate { 1152sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1153 my ($self, $w, $h) = @_;
1072 1154
1155 if ($self->{title_widget}) {
1156 $self->{title_widget}{w} = $w;
1157 $self->{title_widget}{h} = $h;
1158 $self->{title_widget}->invoke_size_allocate ($w, $h);
1159 }
1160
1161 my $border = $self->border;
1162
1073 $h -= List::Util::max 0, $self->border * 2; 1163 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1164 $w -= List::Util::max 0, $border * 2;
1075 1165
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1167
1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1169 if $self->{close_button};
1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1178
1179 1
1180}
1181
1082sub button_down { 1182sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
1084 1184
1085 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1186 my $border = $self->border;
1087 1187
… …
1103 my $dy = $ev->{y} - $oy; 1203 my $dy = $ev->{y} - $oy;
1104 1204
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1205 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1206 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1207
1208 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1209 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1210 };
1111 1211
1112 } elsif ($lr ^ $td) { 1212 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1213 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1214 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1217 my ($ev, $x, $y) = @_;
1118 1218
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1220
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1221 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1222 # HACK: the next line is required to enforce placement
1223 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1224 };
1225 } else {
1226 return 0;
1227 }
1228
1123 } 1229 1
1124} 1230}
1125 1231
1126sub button_up { 1232sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
1128 1234
1129 delete $self->{motion}; 1235 ! ! delete $self->{motion}
1130} 1236}
1131 1237
1132sub mouse_motion { 1238sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1134 1240
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242
1243 ! ! $self->{motion}
1136} 1244}
1137 1245
1138sub _draw { 1246sub _draw {
1139 my ($self) = @_; 1247 my ($self) = @_;
1140 1248
1249 my $child = $self->{children}[0];
1250
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1251 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1252 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1253
1144 glEnable GL_TEXTURE_2D; 1254 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1256
1147 my $border = $self->border; 1257 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1272 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1273 }
1164 1274
1165 glDisable GL_TEXTURE_2D; 1275 glDisable GL_TEXTURE_2D;
1166 1276
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1277 $child->draw;
1278
1279 if ($self->{title_widget}) {
1280 glTranslate 0, $border - $self->{h};
1281 $self->{title_widget}->_draw;
1282
1283 glTranslate 0, - ($border - $self->{h});
1284 }
1285
1286 $self->{close_button}->draw
1287 if $self->{close_button};
1170} 1288}
1171 1289
1172############################################################################# 1290#############################################################################
1173 1291
1174package CFClient::UI::Table; 1292package CFClient::UI::Table;
… …
1197 1315
1198 $child->set_parent ($self); 1316 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1317 $self->{children}[$y][$x] = $child;
1200 1318
1201 $self->realloc; 1319 $self->realloc;
1320}
1321
1322sub remove {
1323 my ($self, $child) = @_;
1324
1325 # TODO: not yet implemented
1202} 1326}
1203 1327
1204# TODO: move to container class maybe? send children a signal on removal? 1328# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1329sub clear {
1206 my ($self) = @_; 1330 my ($self) = @_;
… …
1247 (sum @$ws), 1371 (sum @$ws),
1248 (sum @$hs), 1372 (sum @$hs),
1249 ) 1373 )
1250} 1374}
1251 1375
1252sub size_allocate { 1376sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1377 my ($self, $w, $h) = @_;
1254 1378
1255 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1256 1380
1257 my $req_w = (sum @$ws) || 1; 1381 my $req_w = (sum @$ws) || 1;
… …
1289 } 1413 }
1290 1414
1291 $y += $row_h; 1415 $y += $row_h;
1292 } 1416 }
1293 1417
1418 1
1294} 1419}
1295 1420
1296sub find_widget { 1421sub find_widget {
1297 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1298 1423
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1460 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1461 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1462 )
1338} 1463}
1339 1464
1340sub size_allocate { 1465sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1466 my ($self, $w, $h) = @_;
1342 1467
1343 my $space = $self->{vertical} ? $h : $w; 1468 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1469 my @children = $self->visible_children;
1345 1470
1346 my @req; 1471 my @req;
1347 1472
1348 if ($self->{homogeneous}) { 1473 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1474 @req = ($space / (@children || 1)) x @children;
1350 } else { 1475 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1476 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1477 my $req = List::Util::sum @req;
1353 1478
1354 if ($req > $space) { 1479 if ($req > $space) {
1355 # ah well, not enough space 1480 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1481 $_ *= $space / $req for @req;
1357 } else { 1482 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1483 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1484
1360 $space = ($space - $req) / $expand; # remaining space to give away 1485 $space = ($space - $req) / $expand; # remaining space to give away
1361 1486
1362 $req[$_] += $space * $children->[$_]{expand} 1487 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1488 for 0 .. $#children;
1364 } 1489 }
1365 } 1490 }
1366 1491
1367 CFClient::UI::harmonize \@req; 1492 CFClient::UI::harmonize \@req;
1368 1493
1369 my $pos = 0; 1494 my $pos = 0;
1370 for (0 .. $#$children) { 1495 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1496 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1498
1374 $pos += $alloc; 1499 $pos += $alloc;
1375 } 1500 }
1376 1501
1377 1 1502 1
… …
1467 1592
1468 delete $self->{texture}; 1593 delete $self->{texture};
1469 $self->SUPER::update; 1594 $self->SUPER::update;
1470} 1595}
1471 1596
1597sub realloc {
1598 my ($self) = @_;
1599
1600 delete $self->{ox};
1601 $self->SUPER::realloc;
1602}
1603
1472sub set_text { 1604sub set_text {
1473 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1474 1606
1475 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1477 1609
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1480 1611
1612 delete $self->{size_req};
1481 $self->realloc; 1613 $self->realloc;
1482 $self->update; 1614 $self->update;
1483} 1615}
1484 1616
1485sub set_markup { 1617sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1490 1622
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1624
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1495 1626
1627 delete $self->{size_req};
1496 $self->realloc; 1628 $self->realloc;
1497 $self->update; 1629 $self->update;
1498} 1630}
1499 1631
1500sub size_request { 1632sub size_request {
1501 my ($self) = @_; 1633 my ($self) = @_;
1502 1634
1635 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1636 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1637 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1638 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1639 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1640 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1641
1509 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1510 1643
1511 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1648
1515 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1516 1650
1517 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1652 $h = List::Util::max $h, $h2;
1653 }
1654
1655 [$w, $h]
1519 } 1656 };
1520 1657
1521 ($w, $h) 1658 @{ $self->{size_req} }
1522} 1659}
1523 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1524sub size_allocate { 1665sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1526 1667
1668 delete $self->{ox};
1669
1527 delete $self->{texture}; 1670 delete $self->{texture}
1671 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1672
1673 1
1528} 1674}
1529 1675
1530sub set_fontsize { 1676sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1532 1678
1533 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1534 delete $self->{texture}; 1681 delete $self->{texture};
1535 1682
1536 $self->realloc; 1683 $self->realloc;
1537} 1684}
1538 1685
1686sub reconfigure {
1687 my ($self) = @_;
1688
1689 delete $self->{size_req};
1690 delete $self->{texture};
1691
1692 $self->SUPER::reconfigure;
1693}
1694
1539sub _draw { 1695sub _draw {
1540 my ($self) = @_; 1696 my ($self) = @_;
1541 1697
1542 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1543 1699
1544 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1707
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1708 [$self->{layout}->size]
1709 };
1553 1710
1711 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1557 1715
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1561
1562 $tex
1563 }; 1719 };
1564 1720
1565 glEnable GL_TEXTURE_2D; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1567 1723
1568 if ($tex->{format} == GL_ALPHA) { 1724 $self->{layout}->render ($self->{ox}, $self->{oy});
1569 glColor @{$self->{fg}};
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1574
1575 glDisable GL_TEXTURE_2D;
1576} 1725}
1577 1726
1578############################################################################# 1727#############################################################################
1579 1728
1580package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1594 can_hover => 1, 1743 can_hover => 1,
1595 can_focus => 1, 1744 can_focus => 1,
1596 valign => 0, 1745 valign => 0,
1597 can_events => 1, 1746 can_events => 1,
1598 #text => ... 1747 #text => ...
1748 #hidden => "*",
1599 @_ 1749 @_
1600 ) 1750 )
1601} 1751}
1602 1752
1603sub _set_text { 1753sub _set_text {
… …
1605 1755
1606 delete $self->{cur_h}; 1756 delete $self->{cur_h};
1607 1757
1608 return if $self->{text} eq $text; 1758 return if $self->{text} eq $text;
1609 1759
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1760 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1761 $self->{text} = $text;
1614 1762
1615 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1765 delete $self->{size_req};
1617 1766
1618 $self->_emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1768
1769 $self->realloc;
1770 $self->update;
1619} 1771}
1620 1772
1621sub set_text { 1773sub set_text {
1622 my ($self, $text) = @_; 1774 my ($self, $text) = @_;
1623 1775
1624 $self->{cursor} = length $text; 1776 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1777 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1778}
1629 1779
1630sub get_text { 1780sub get_text {
1631 $_[0]{text} 1781 $_[0]{text}
1632} 1782}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1638 1788
1639 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1640} 1790}
1641 1791
1642sub key_down { 1792sub invoke_key_down {
1643 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1644 1794
1645 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
… …
1659 } elsif ($sym == CFClient::SDLK_HOME) { 1809 } elsif ($sym == CFClient::SDLK_HOME) {
1660 $self->{cursor} = 0; 1810 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) { 1811 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1813 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1814 $self->emit ('escape');
1665 } elsif ($uni) { 1815 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else {
1818 return 0;
1667 } 1819 }
1668 1820
1669 $self->_set_text ($text); 1821 $self->_set_text ($text);
1670 1822
1671 $self->realloc; 1823 $self->realloc;
1672}
1673 1824
1825 1
1826}
1827
1674sub focus_in { 1828sub invoke_focus_in {
1675 my ($self) = @_; 1829 my ($self) = @_;
1676 1830
1677 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1678 1832
1679 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1680} 1834}
1681 1835
1682sub button_down { 1836sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1684 1838
1685 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 1840
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 1842
1689 # byte-index to char-index 1843 # byte-index to char-index
1690 my $text = $self->{text}; 1844 my $text = $self->{text};
1691 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1693 1847
1694 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1695 $self->update; 1849 $self->update;
1850
1851 1
1696} 1852}
1697 1853
1698sub mouse_motion { 1854sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1856# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1857
1858 1
1701} 1859}
1702 1860
1703sub _draw { 1861sub _draw {
1704 my ($self) = @_; 1862 my ($self) = @_;
1705 1863
1706 local $self->{fg} = $self->{fg}; 1864 local $self->{fg} = $self->{fg};
1707 1865
1708 if ($FOCUS == $self) { 1866 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1867 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1868 $self->{fg} = $self->{active_fg};
1711 } else { 1869 } else {
1712 glColor @{$self->{bg}}; 1870 glColor_premultiply @{$self->{bg}};
1713 } 1871 }
1714 1872
1715 glEnable GL_BLEND; 1873 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1875 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1876 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1877 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1878 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1879 glVertex $self->{w}, 0;
… …
1746 1904
1747our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1748 1906
1749use CFClient::OpenGL; 1907use CFClient::OpenGL;
1750 1908
1751sub key_down { 1909sub invoke_key_down {
1752 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1753 1911
1754 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1755 1913
1756 if ($sym == 13) { 1914 if ($sym == 13) {
1757 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1759 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 1920 $self->emit (activate => $txt);
1762 $self->update; 1921 $self->update;
1763 1922
1764 } elsif ($sym == CFClient::SDLK_UP) { 1923 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 1924 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 1925 $self->{history_saveback} = $self->get_text;
… …
1782 } else { 1941 } else {
1783 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1784 } 1943 }
1785 1944
1786 } else { 1945 } else {
1787 $self->SUPER::key_down ($ev); 1946 return $self->SUPER::invoke_key_down ($ev)
1947 }
1948
1788 } 1949 1
1789
1790} 1950}
1791 1951
1792############################################################################# 1952#############################################################################
1793 1953
1794package CFClient::UI::Button; 1954package CFClient::UI::Button;
… …
1815 can_events => 1, 1975 can_events => 1,
1816 @_ 1976 @_
1817 ) 1977 )
1818} 1978}
1819 1979
1820sub activate { }
1821
1822sub button_up { 1980sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1824 1982
1825 $self->emit ("activate") 1983 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 1985 && $y >= 0 && $y < $self->{h};
1986
1987 1
1828} 1988}
1829 1989
1830sub _draw { 1990sub _draw {
1831 my ($self) = @_; 1991 my ($self) = @_;
1832 1992
1833 local $self->{fg} = $self->{fg}; 1993 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 1994
1839 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 1997 glColor 0, 0, 0, 1;
1842 1998
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1999 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844 2000
1845 glDisable GL_TEXTURE_2D; 2001 glDisable GL_TEXTURE_2D;
1846 2002
1847 $self->SUPER::_draw; 2003 $self->SUPER::_draw;
2004}
2005
2006#############################################################################
2007
2008package CFClient::UI::ImageButton;
2009
2010our @ISA = CFClient::UI::Image::;
2011
2012use CFClient::OpenGL;
2013
2014my %textures;
2015
2016sub new {
2017 my $class = shift;
2018
2019 my $self = $class->SUPER::new (
2020 padding_x => 4,
2021 padding_y => 4,
2022 fg => [1, 1, 1],
2023 active_fg => [0, 0, 1],
2024 can_hover => 1,
2025 align => 0,
2026 valign => 0,
2027 can_events => 1,
2028 @_
2029 );
2030}
2031
2032sub invoke_button_up {
2033 my ($self, $ev, $x, $y) = @_;
2034
2035 $self->emit ("activate")
2036 if $x >= 0 && $x < $self->{w}
2037 && $y >= 0 && $y < $self->{h};
2038
2039 1
1848} 2040}
1849 2041
1850############################################################################# 2042#############################################################################
1851 2043
1852package CFClient::UI::CheckBox; 2044package CFClient::UI::CheckBox;
… …
1879 my ($self) = @_; 2071 my ($self) = @_;
1880 2072
1881 (6) x 2 2073 (6) x 2
1882} 2074}
1883 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
1884sub button_down { 2084sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
1886 2086
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2089 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2090 } else {
2091 return 0
2092 }
2093
1891 } 2094 1
1892} 2095}
1893 2096
1894sub _draw { 2097sub _draw {
1895 my ($self) = @_; 2098 my ($self) = @_;
1896 2099
… …
1916package CFClient::UI::Image; 2119package CFClient::UI::Image;
1917 2120
1918our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
1919 2122
1920use CFClient::OpenGL; 2123use CFClient::OpenGL;
1921use Carp qw/confess/;
1922 2124
1923our %loaded_images; 2125our %texture_cache;
1924 2126
1925sub new { 2127sub new {
1926 my $class = shift; 2128 my $class = shift;
1927 2129
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
1929 2134
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
1931 2137
1932 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1934 2140
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
1936 2142
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2144
1941 $self 2145 $self
1942} 2146}
1943 2147
1944sub size_request { 2148sub size_request {
1945 my ($self) = @_; 2149 my ($self) = @_;
1946 2150
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
1948} 2152}
1949 2153
1950sub _draw { 2154sub _draw {
1951 my ($self) = @_; 2155 my ($self) = @_;
1952 2156
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2267
2064 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2273
2067 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2279
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2280 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2281 glBegin GL_QUADS;
… …
2088 2296
2089 if ($t3) { 2297 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2304 glEnd;
2097 } 2305 }
2098 2306
2099 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2187 $self->update; 2395 $self->update;
2188 2396
2189 $self 2397 $self
2190} 2398}
2191 2399
2192sub changed { }
2193
2194sub set_range { 2400sub set_range {
2195 my ($self, $range) = @_; 2401 my ($self, $range) = @_;
2196 2402
2197 ($range, $self->{range}) = ($self->{range}, $range); 2403 ($range, $self->{range}) = ($self->{range}, $range);
2198 2404
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2405 if ("@$range" ne "@{$self->{range}}") {
2406 $self->update;
2407 $self->set_value ($self->{range}[0]);
2408 }
2201} 2409}
2202 2410
2203sub set_value { 2411sub set_value {
2204 my ($self, $value) = @_; 2412 my ($self, $value) = @_;
2205 2413
… …
2216 if $unit; 2424 if $unit;
2217 2425
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2426 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2427
2220 if ($value != $old_value) { 2428 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2429 $self->emit (changed => $value);
2222 $self->update; 2430 $self->update;
2223 } 2431 }
2224} 2432}
2225 2433
2226sub size_request { 2434sub size_request {
2227 my ($self) = @_; 2435 my ($self) = @_;
2228 2436
2229 ($self->{req_w}, $self->{req_h}) 2437 ($self->{req_w}, $self->{req_h})
2230} 2438}
2231 2439
2232sub button_down { 2440sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2234 2442
2235 $self->SUPER::button_down ($ev, $x, $y); 2443 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2444
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2445 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2446
2239 $self->mouse_motion ($ev, $x, $y); 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2448}
2241 2449
2242sub mouse_motion { 2450sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2244 2452
2245 if ($GRAB == $self) { 2453 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2455
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2456 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2457
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2458 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2459
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2460 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2461 } else {
2462 return 0;
2463 }
2464
2253 } 2465 1
2254} 2466}
2255 2467
2256sub update { 2468sub update {
2257 my ($self) = @_; 2469 my ($self) = @_;
2258 2470
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2471 delete $self->{knob_w};
2472 $self->SUPER::update;
2473}
2474
2475sub _draw {
2476 my ($self) = @_;
2477
2478 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2479 $self->set_value ($self->{range}[0]);
2261 2480
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2481 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2482 my $range = ($hi - $page - $lo) || 1e-100;
2264 2483
… …
2270 $value = ($value - $lo) / $range; 2489 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2490 $value = $value * $self->{scale} + $self->{offset};
2272 2491
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2492 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2493 $self->{knob_w} = $knob_w;
2275 }); 2494 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2495
2283 $self->SUPER::_draw (); 2496 $self->SUPER::_draw ();
2284 2497
2285 glScale $self->{w}, $self->{h}; 2498 glScale $self->{w}, $self->{h};
2286 2499
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2560sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2561sub set_value { shift->{slider}->set_value (@_) }
2349 2562
2350############################################################################# 2563#############################################################################
2351 2564
2352package CFClient::UI::TextView; 2565package CFClient::UI::TextScroller;
2353 2566
2354our @ISA = CFClient::UI::HBox::; 2567our @ISA = CFClient::UI::HBox::;
2355 2568
2356use CFClient::OpenGL; 2569use CFClient::OpenGL;
2357 2570
… …
2359 my $class = shift; 2572 my $class = shift;
2360 2573
2361 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2362 fontsize => 1, 2575 fontsize => 1,
2363 can_events => 0, 2576 can_events => 0,
2577 indent => 0,
2364 #font => default_font 2578 #font => default_font
2365 @_, 2579 @_,
2366 2580
2367 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2368 par => [], 2582 par => [],
2369 height => 0, 2583 height => 0,
2370 children => [ 2584 children => [
2371 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2383 2597
2384 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2599 $self->reflow;
2386} 2600}
2387 2601
2602sub size_request {
2603 my ($self) = @_;
2604
2605 my ($empty, $slider) = @{ $self->{children} };
2606
2607 local $self->{children} = [$empty, $slider];
2608 $self->SUPER::size_request
2609}
2610
2388sub size_allocate { 2611sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2612 my ($self, $w, $h) = @_;
2390 2613
2391 $self->SUPER::size_allocate ($w, $h); 2614 my ($empty, $slider, @other) = @{ $self->{children} };
2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 2616
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2619 $self->{layout}->set_width ($empty->{w});
2620 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2621
2397 $self->reflow; 2622 $self->reflow;
2398}
2399 2623
2400sub text_size { 2624 local $self->{children} = [$empty, $slider];
2401 my ($self, $text, $indent) = @_; 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2626}
2627
2628sub get_layout {
2629 my ($self, $para) = @_;
2402 2630
2403 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2404 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2636 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2637 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2638 $layout->set_markup ($para->{markup});
2639
2640 $layout->set_shapes (
2641 map
2642 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2643 @{$para->{widget}}
2408 2644 );
2645
2409 $layout->size 2646 $layout
2410} 2647}
2411 2648
2412sub reflow { 2649sub reflow {
2413 my ($self) = @_; 2650 my ($self) = @_;
2414 2651
… …
2423 $self->{children}[1]->set_value ($offset); 2660 $self->{children}[1]->set_value ($offset);
2424} 2661}
2425 2662
2426sub clear { 2663sub clear {
2427 my ($self) = @_; 2664 my ($self) = @_;
2665
2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2428 2668
2429 $self->{par} = []; 2669 $self->{par} = [];
2430 $self->{height} = 0; 2670 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2672}
2433 2673
2434sub add_paragraph { 2674sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2436 2676
2437 for my $line (split /\n/, $text) { 2677 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2678
2439 $self->{height} += $h; 2679 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2680 w => 1e10,
2681 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2441 } 2686 };
2442 2687
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2688 $self->add (@w) if @w;
2689 push @{$self->{par}}, $para;
2690
2691 $self->{need_reflow}++;
2692 $self->update;
2693}
2694
2695sub scroll_to_bottom {
2696 my ($self) = @_;
2697
2698 $self->{scroll_to_bottom} = 1;
2699 $self->update;
2444} 2700}
2445 2701
2446sub update { 2702sub update {
2447 my ($self) = @_; 2703 my ($self) = @_;
2448 2704
… …
2450 2706
2451 return unless $self->{h} > 0; 2707 return unless $self->{h} > 0;
2452 2708
2453 delete $self->{texture}; 2709 delete $self->{texture};
2454 2710
2455 $ROOT->on_post_alloc ($self, sub { 2711 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2713
2458 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2715 my $height = 0;
2460 2716
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2717 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2719 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2720 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2721
2471 $_->[1] = $h; 2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2472 } 2725 }
2473 2726
2474 $height += $_->[1]; 2727 $height += $para->{h};
2475 } 2728 }
2476 2729
2477 $self->{height} = $height; 2730 $self->{height} = $height;
2478 2731
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2732 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2733
2481 delete $self->{texture}; 2734 delete $self->{texture};
2482 } 2735 }
2483 2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2742 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
2487 2744
2488 my $top = int $self->{children}[1]{range}[0]; 2745 my $top = int $self->{children}[1]{range}[0];
2489 2746
2490 my $y0 = $top; 2747 my $y0 = $top;
2491 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2492 2749
2493 my $y = 0; 2750 my $y = 0;
2494 2751
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2753 my $h = $para->{h};
2505 2754
2506 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 2756
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2757 my $layout = $self->get_layout ($para);
2512 2758
2513 glRasterPos $par->[3], $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2760
2761 if (my @w = @{ $para->{widget} }) {
2762 my @s = $layout->get_shapes;
2763
2764 for (@w) {
2765 my ($dx, $dy) = splice @s, 0, 2, ();
2766
2767 $_->{x} = $dx + $para->{indent};
2768 $_->{y} = $dy + $y - $y0;
2769
2770 $_->draw;
2771 }
2772 }
2515 } 2773 }
2516 2774
2517 $y += $h; 2775 $y += $h;
2518 } 2776 }
2519
2520 glDisable GL_BLEND;
2521 }; 2777 };
2522 }); 2778 });
2523} 2779}
2524 2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2788}
2789
2525sub _draw { 2790sub _draw {
2526 my ($self) = @_; 2791 my ($self) = @_;
2527 2792
2528 glEnable GL_TEXTURE_2D; 2793 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2795 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2796 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2533 2798
2534 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2535
2536} 2800}
2537 2801
2538############################################################################# 2802#############################################################################
2539 2803
2540package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
… …
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 2891 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2892 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 2893 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 2894 . "visible $widget->{visible}";
2631 } 2895 }
2896
2897 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//;
2632 2899
2633 $self->add (new CFClient::UI::Label 2900 $self->add (new CFClient::UI::Label
2634 markup => $tooltip, 2901 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 2903 fontsize => 0.8,
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 2914
2648 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2649} 2916}
2650 2917
2651sub size_allocate { 2918sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 2919 my ($self, $w, $h) = @_;
2653 2920
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 2921 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 2922}
2656 2923
2657sub visibility_change { 2924sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 2925 my ($self, $visible) = @_;
2659 2926
2660 return unless $visible; 2927 return unless $visible;
2661 2928
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 2929 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2664 or return; 2931 or return;
2665 2932
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 2934
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 2936 if $x + $self->{w} > $self->{root}{w};
2670 2937
2671 $self->move_abs ($x, $y); 2938 $self->move_abs ($x, $y);
2672 }); 2939 });
2673} 2940}
2674 2941
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 3031
2765 if ($tex) { 3032 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3033 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3035 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3037 glDisable GL_TEXTURE_2D;
2771 } 3038 }
2772} 3039}
2773 3040
2774sub DESTROY { 3041sub destroy {
2775 my ($self) = @_; 3042 my ($self) = @_;
2776 3043
2777 $self->{timer}->cancel 3044 $self->{timer}->cancel
2778 if $self->{timer}; 3045 if $self->{timer};
2779 3046
2780 $self->SUPER::DESTROY; 3047 $self->SUPER::destroy;
2781} 3048}
2782 3049
2783############################################################################# 3050#############################################################################
2784 3051
2785package CFClient::UI::Inventory; 3052package CFClient::UI::Buttonbar;
2786 3053
2787our @ISA = CFClient::UI::ScrolledWindow::; 3054our @ISA = CFClient::UI::HBox::;
2788 3055
2789sub new { 3056# TODO: should actualyl wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 3057
2825############################################################################# 3058#############################################################################
2826 3059
2827package CFClient::UI::Menu; 3060package CFClient::UI::Menu;
2828 3061
… …
2840 ); 3073 );
2841 3074
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3075 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843 3076
2844 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
2846 3079
2847 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
2848 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
2849 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
2850 can_hover => 1, 3097 can_hover => 1,
2851 can_events => 1, 3098 can_events => 1,
2852 text => $widget; 3099 markup => $widget,
3100 tooltip => $tooltip;
3101 }
2853 } 3102 }
2854 3103
2855 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
2856 3105
2857 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
2862 3111
2863# popup given the event (must be a mouse button down event currently) 3112# popup given the event (must be a mouse button down event currently)
2864sub popup { 3113sub popup {
2865 my ($self, $ev) = @_; 3114 my ($self, $ev) = @_;
2866 3115
2867 $self->_emit ("popdown"); 3116 $self->emit ("popdown");
2868 3117
2869 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3119 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
2872 3121
2873 $self->show; 3122 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3123 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3124}
2876 3125
2877sub mouse_motion { 3126sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2879 3128
2880 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3132
3133 0
3134}
3135
2885sub button_up { 3136sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
2887 3138
2888 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3140 undef $GRAB;
2890 $self->hide; 3141 $self->hide;
2891 3142
2892 $self->_emit ("popdown"); 3143 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
3145 } else {
3146 return 0
3147 }
3148
2894 } 3149 1
2895} 3150}
2896 3151
2897############################################################################# 3152#############################################################################
2898 3153
2899package CFClient::UI::Statusbox; 3154package CFClient::UI::Multiplexer;
2900 3155
2901our @ISA = CFClient::UI::VBox::; 3156our @ISA = CFClient::UI::Container::;
2902 3157
2903sub new { 3158sub new {
2904 my $class = shift; 3159 my $class = shift;
2905 3160
2906 $class->SUPER::new ( 3161 my $self = $class->SUPER::new (
3162 @_,
3163 );
3164
3165 $self->{current} = $self->{children}[0]
3166 if @{ $self->{children} };
3167
3168 $self
3169}
3170
3171sub add {
3172 my ($self, @widgets) = @_;
3173
3174 $self->SUPER::add (@widgets);
3175
3176 $self->{current} = $self->{children}[0]
3177 if @{ $self->{children} };
3178}
3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3184}
3185
3186sub set_current_page {
3187 my ($self, $page_or_widget) = @_;
3188
3189 my $widget = ref $page_or_widget
3190 ? $page_or_widget
3191 : $self->{children}[$page_or_widget];
3192
3193 $self->{current} = $widget;
3194 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3195
3196 $self->emit (page_changed => $self->{current});
3197
3198 $self->realloc;
3199}
3200
3201sub visible_children {
3202 $_[0]{current}
3203}
3204
3205sub size_request {
3206 my ($self) = @_;
3207
3208 $self->{current}->size_request
3209}
3210
3211sub invoke_size_allocate {
3212 my ($self, $w, $h) = @_;
3213
3214 $self->{current}->configure (0, 0, $w, $h);
3215
3216 1
3217}
3218
3219sub _draw {
3220 my ($self) = @_;
3221
3222 $self->{current}->draw;
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Notebook;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 buttonbar => (new CFClient::UI::Buttonbar),
3236 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3237 # filter => # will be put between multiplexer and $self
3238 @_,
3239 );
3240
3241 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3242 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3243
3244 $self
3245}
3246
3247sub add {
3248 my ($self, $title, $widget, $tooltip) = @_;
3249
3250 Scalar::Util::weaken $self;
3251
3252 $self->{buttonbar}->add (new CFClient::UI::Button
3253 markup => $title,
3254 tooltip => $tooltip,
3255 on_activate => sub { $self->set_current_page ($widget) },
3256 );
3257
3258 $self->{multiplexer}->add ($widget);
3259}
3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3265}
3266
3267sub set_current_page {
3268 my ($self, $page) = @_;
3269
3270 $self->{multiplexer}->set_current_page ($page);
3271 $self->emit (page_changed => $self->{multiplexer}{current});
3272}
3273
3274#############################################################################
3275
3276package CFClient::UI::Combobox;
3277
3278use utf8;
3279
3280our @ISA = CFClient::UI::Button::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (
3286 options => [], # [value, title, longdesc], ...
3287 value => undef,
3288 @_,
3289 );
3290
3291 $self->_set_value ($self->{value});
3292
3293 $self
3294}
3295
3296sub invoke_button_down {
3297 my ($self, $ev) = @_;
3298
3299 my @menu_items;
3300
3301 for (@{ $self->{options} }) {
3302 my ($value, $title, $tooltip) = @$_;
3303
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 }
3306
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308}
3309
3310sub _set_value {
3311 my ($self, $value) = @_;
3312
3313 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3314 or return;
3315
3316 $self->{value} = $item->[0];
3317 $self->set_markup ("$item->[1] ⇓");
3318 $self->set_tooltip ($item->[2]);
3319}
3320
3321sub set_value {
3322 my ($self, $value) = @_;
3323
3324 return unless $self->{value} ne $value;
3325
3326 $self->_set_value ($value);
3327 $self->emit (changed => $value);
3328}
3329
3330#############################################################################
3331
3332package CFClient::UI::Statusbox;
3333
3334our @ISA = CFClient::UI::VBox::;
3335
3336sub new {
3337 my $class = shift;
3338
3339 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3340 fontsize => 0.8,
2908 @_, 3341 @_,
2909 ) 3342 );
3343
3344 Scalar::Util::weaken (my $this = $self);
3345
3346 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347
3348 $self
2910} 3349}
2911 3350
2912sub reorder { 3351sub reorder {
2913 my ($self) = @_; 3352 my ($self) = @_;
2914 my $NOW = time; 3353 my $NOW = Time::HiRes::time;
3354
3355 # freeze display when hovering over any label
3356 return if $CFClient::UI::TOOLTIP->{owner}
3357 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3358 values %{ $self->{item} };
2915 3359
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3360 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3361 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3362 }
2919 3363
… …
2922 my @items = sort { 3366 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3367 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3368 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3369 } values %{ $self->{item} };
2926 3370
3371 $self->{timer}->interval (1);
3372
2927 my $count = 10 + 1; 3373 my $count = 10 + 1;
2928 for my $item (@items) { 3374 for my $item (@items) {
2929 last unless --$count; 3375 last unless --$count;
2930 3376
2931 push @widgets, $item->{label} ||= do { 3377 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3378 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3379 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3380 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3381 : $item->{text};
2936 3382
… …
2944 tooltip => $item->{tooltip}, 3390 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3391 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3392 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3393 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3394 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3395 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3396 can_events => 1,
2951 can_hover => 1 3397 can_hover => 1
2952 }; 3398 };
3399
3400 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3401 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3402 $label->update;
3403 $label->set_max_size (undef, $label->{req_h} * $diff)
3404 if $diff < 1;
3405 $self->{timer}->interval (1/30);
3406 } else {
3407 $label->{fg}[3] = $item->{fg}[3] || 1;
3408 }
3409
3410 push @widgets, $label;
2953 } 3411 }
2954 3412
2955 $self->clear; 3413 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3414 $self->SUPER::add (reverse @widgets);
2957} 3415}
… …
2962 $text =~ s/^\s+//; 3420 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3421 $text =~ s/\s+$//;
2964 3422
2965 return unless $text; 3423 return unless $text;
2966 3424
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3425 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3426
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3427 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3428
2971 if (my $item = $self->{item}{$group}) { 3429 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3430 if ($item->{text} eq $text) {
2973 $item->{count}++; 3431 $item->{count}++;
2974 } else { 3432 } else {
2975 $item->{count} = 1; 3433 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3434 $item->{text} = $item->{tooltip} = $text;
2977 } 3435 }
2978 $item->{id} = ++$self->{id}; 3436 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3437 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3438 delete $item->{label};
2981 } else { 3439 } else {
2982 $self->{item}{$group} = { 3440 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3441 id => ++$self->{id},
… …
2989 count => 1, 3447 count => 1,
2990 %arg, 3448 %arg,
2991 }; 3449 };
2992 } 3450 }
2993 3451
3452 $ROOT->on_refresh (reorder => sub {
2994 $self->reorder; 3453 $self->reorder;
3454 });
2995} 3455}
2996 3456
2997sub reconfigure { 3457sub reconfigure {
2998 my ($self) = @_; 3458 my ($self) = @_;
2999 3459
… …
3002 3462
3003 $self->reorder; 3463 $self->reorder;
3004 $self->SUPER::reconfigure; 3464 $self->SUPER::reconfigure;
3005} 3465}
3006 3466
3467sub destroy {
3468 my ($self) = @_;
3469
3470 $self->{timer}->cancel;
3471
3472 $self->SUPER::destroy;
3473}
3474
3007############################################################################# 3475#############################################################################
3008 3476
3477package CFClient::UI::Inventory;
3478
3479our @ISA = CFClient::UI::Table::;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
3485 col_expand => [0, 1, 0],
3486 @_,
3487 );
3488
3489 $self
3490}
3491
3492sub set_items {
3493 my ($self, $items) = @_;
3494
3495 $self->clear;
3496 return unless $items;
3497
3498 my @items = sort {
3499 ($a->{type} <=> $b->{type})
3500 or ($a->{name} cmp $b->{name})
3501 } values %$items;
3502
3503 $self->{real_items} = \@items;
3504
3505 my $row = 0;
3506 for my $item (@items) {
3507 CFClient::Item::update_widgets $item;
3508
3509 $self->add (0, $row, $item->{face_widget});
3510 $self->add (1, $row, $item->{desc_widget});
3511 $self->add (2, $row, $item->{weight_widget});
3512
3513 $row++;
3514 }
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::SpellList;
3520
3521our @ISA = CFClient::UI::Table::;
3522
3523sub new {
3524 my $class = shift;
3525
3526 my $self = $class->SUPER::new (
3527 binding => [],
3528 commands => [],
3529 @_,
3530 )
3531}
3532
3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546sub rebuild_spell_list {
3547 my ($self) = @_;
3548
3549 $CFClient::UI::ROOT->on_refresh ($self => sub {
3550 $self->clear;
3551
3552 return unless $::CONN;
3553
3554 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560 my $row = 0;
3561
3562 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563 my $spell = $self->{spell}{$_};
3564
3565 $row++;
3566
3567 my $spell_cb = sub {
3568 my ($widget, $ev) = @_;
3569
3570 if ($ev->{button} == 1) {
3571 $::CONN->user_send ("cast $spell->{name}");
3572 } elsif ($ev->{button} == 2) {
3573 $::CONN->user_send ("invoke $spell->{name}");
3574 } elsif ($ev->{button} == 3) {
3575 (new CFClient::UI::Menu
3576 items => [
3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579 ],
3580 )->popup ($ev);
3581 } else {
3582 return 0;
3583 }
3584
3585 1
3586 };
3587
3588 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590 #TODO: add path info to tooltip
3591 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593 $self->add (0, $row, new CFClient::UI::Face
3594 face => $spell->{face},
3595 can_hover => 1,
3596 can_events => 1,
3597 tooltip => $tooltip,
3598 on_button_down => $spell_cb,
3599 );
3600
3601 $self->add (1, $row, new CFClient::UI::Label
3602 expand => 1,
3603 text => $spell->{name},
3604 can_hover => 1,
3605 can_events => 1,
3606 tooltip => $tooltip,
3607 on_button_down => $spell_cb,
3608 );
3609
3610 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614 }
3615 });
3616}
3617
3618sub add_spell {
3619 my ($self, $spell) = @_;
3620
3621 $self->{spell}->{$spell->{name}} = $spell;
3622 $self->rebuild_spell_list;
3623}
3624
3625sub remove_spell {
3626 my ($self, $spell) = @_;
3627
3628 delete $self->{spell}->{$spell->{name}};
3629 $self->rebuild_spell_list;
3630}
3631
3632sub clear_spells {
3633 my ($self) = @_;
3634
3635 $self->{spell} = {};
3636 $self->rebuild_spell_list;
3637}
3638
3639#############################################################################
3640
3009package CFClient::UI::Root; 3641package CFClient::UI::Root;
3010 3642
3011our @ISA = CFClient::UI::Container::; 3643our @ISA = CFClient::UI::Container::;
3644
3645use List::Util qw(min max);
3012 3646
3013use CFClient::OpenGL; 3647use CFClient::OpenGL;
3014 3648
3015sub new { 3649sub new {
3016 my $class = shift; 3650 my $class = shift;
… …
3043 $coord = $max - $size if $coord > $max - $size; 3677 $coord = $max - $size if $coord > $max - $size;
3044 3678
3045 int $coord + 0.5 3679 int $coord + 0.5
3046} 3680}
3047 3681
3048sub size_allocate { 3682sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
3050 3684
3051 for my $child ($self->children) { 3685 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3686 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3687
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3691 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3692 $Y = _to_pixel $Y, $H, $self->{h};
3059 3693
3060 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
3061 } 3695 }
3696
3697 1
3062} 3698}
3063 3699
3064sub coord2local { 3700sub coord2local {
3065 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
3066 3702
… …
3122 $_->() 3758 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3759 for values %{delete $self->{refresh_hook}};
3124 } 3760 }
3125 3761
3126 if ($self->{realloc}) { 3762 if ($self->{realloc}) {
3763 my %queue;
3127 my @queue; 3764 my @queue;
3765 my $widget;
3128 3766
3767 outer:
3129 while () { 3768 while () {
3130 if ($self->{realloc}) { 3769 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3770 for $widget (values %$realloc) {
3771 $widget->{visible} or next; # do not resize invisible widgets
3132 3772
3133 use sort 'stable'; 3773 $queue{$widget+0}++ and next; # duplicates are common
3134 3774
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3775 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3776 }
3137 } 3777 }
3138 3778
3779 while () {
3780 @queue or last outer;
3781
3139 my $widget = pop @queue || last; 3782 $widget = pop @{ $queue[-1] || [] }
3783 and last;
3784
3785 pop @queue;
3786 }
3140 3787
3141 $widget->{visible} or last; # do not resize invisible widgets 3788 delete $queue{$widget+0};
3142 3789
3143 my ($w, $h) = $widget->size_request; 3790 my ($w, $h) = $widget->size_request;
3144 3791
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3792 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3793 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3794
3795 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3796 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3797
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3798 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3799 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3800
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3801 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 3804 $widget->{req_h} = $h;
3155 3805
3156 $self->{size_alloc}{$widget+0} = $widget; 3806 $self->{size_alloc}{$widget+0} = $widget;
3157 3807
3158 if (my $parent = $widget->{parent}) { 3808 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3809 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3810 unless $queue{$parent+0};
3811
3161 $parent->{force_size_alloc} = 1; 3812 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3813 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3814 }
3164 } 3815 }
3165 3816
… …
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178 3829
3179 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3181 3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838
3182 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3184 3841
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3843 $widget->{old_w} = $widget->{w};
3844 $widget->{old_h} = $widget->{h};
3845
3186 $widget->{w} = $w; 3846 $widget->{w} = $w;
3187 $widget->{h} = $h; 3847 $widget->{h} = $h;
3188 3848
3189 $widget->emit (size_allocate => $w, $h); 3849 $widget->emit (size_allocate => $w, $h);
3190 } 3850 }
… …
3205 glLoadIdentity; 3865 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3867 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3868 glLoadIdentity;
3209 3869
3870 {
3871 package CFClient::UI::Base;
3872
3873 ($draw_x, $draw_y, $draw_w, $draw_h) =
3874 (0, 0, $self->{w}, $self->{h});
3875 }
3876
3210 $self->_draw; 3877 $self->_draw;
3211} 3878}
3212
3213#############################################################################
3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389 3879
3390############################################################################# 3880#############################################################################
3391 3881
3392package CFClient::UI; 3882package CFClient::UI;
3393 3883

Diff Legend

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