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.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC

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

Diff Legend

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