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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.356 by root, Wed Dec 6 00:15:12 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event; 8use Event;
9 9
10use CFClient; 10use CFPlus;
11use CFPlus::Pod;
11use CFClient::Texture; 12use CFPlus::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
… …
79sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 82 if $FOCUS;
82} 83}
83 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
84sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
85 my ($ev) = @_; 99 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
87 101
88 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
90 106
91 $GRAB = $widget; 107 $GRAB = $widget;
92 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
93 109
94 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->cb->();
95 } 111 }
96 112
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
98 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
100 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
101} 123}
102 124
103sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
104 my ($ev) = @_; 126 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 127
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 129
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 131
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
112 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 134
114 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 137 $grab->update if $grab;
117 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
118 139
140 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 141 $TOOLTIP_WATCHER->cb->();
120 } 142 }
121} 143}
122 144
123sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
124 my ($ev) = @_; 146 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
126 148
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 150
129 if ($widget != $HOVER) { 151 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 152
132 $hover->update if $hover && $hover->{can_hover}; 153 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 154 if $HOVER;
140} 155}
141 156
142# convert position array to integers 157# convert position array to integers
143sub harmonize { 158sub harmonize {
… …
193 reconfigure_widgets; 208 reconfigure_widgets;
194} 209}
195 210
196############################################################################# 211#############################################################################
197 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
198package CFClient::UI::Base; 221package CFPlus::UI::Base;
199 222
200use strict; 223use strict;
201 224
202use CFClient::OpenGL; 225use CFPlus::OpenGL;
203 226
204sub new { 227sub new {
205 my $class = shift; 228 my $class = shift;
206 229
207 my $self = bless { 230 my $self = bless {
… …
212 h => undef, 235 h => undef,
213 can_events => 1, 236 can_events => 1,
214 @_ 237 @_
215 }, $class; 238 }, $class;
216 239
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 241
219 for (keys %$self) { 242 for (keys %$self) {
220 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
222 } 245 }
223 } 246 }
224 247
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 253
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 256
234 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
247sub show { 270sub show {
248 my ($self) = @_; 271 my ($self) = @_;
249 272
250 return if $self->{parent}; 273 return if $self->{parent};
251 274
252 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
253} 276}
254 277
255sub set_visible { 278sub set_visible {
256 my ($self) = @_; 279 my ($self) = @_;
257 280
… …
278 delete $self->{root}; 301 delete $self->{root};
279 302
280 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
282 305
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
285 308
286 $self->focus_out; 309 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
289} 311}
290 312
291sub set_visibility { 313sub set_visibility {
292 my ($self, $visible) = @_; 314 my ($self, $visible) = @_;
… …
336sub size_request { 358sub size_request {
337 require Carp; 359 require Carp;
338 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
339} 361}
340 362
363sub baseline_shift {
364 0
365}
366
341sub configure { 367sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
343 369
344 if ($self->{aspect}) { 370 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
346 372
347 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 375
350 # use alignment to adjust x, y 376 # use alignment to adjust x, y
351 377
352 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
367 393
368 $self->{root}{size_alloc}{$self+0} = $self; 394 $self->{root}{size_alloc}{$self+0} = $self;
369 } 395 }
370} 396}
371 397
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 398sub children {
377 # nop 399 # nop
378} 400}
379 401
380sub visible_children { 402sub visible_children {
… …
398 420
399 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
400 422
401 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
402 424
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 428 }
407} 429}
408 430
409# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
410sub coord2local { 432sub coord2local {
411 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
412 434
435 Carp::confess unless $self->{parent};#d#
436
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 438}
415 439
416# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
417sub coord2global { 441sub coord2global {
418 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
419 443
444 Carp::confess unless $self->{parent};#d#
445
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 447}
422 448
423sub focus_in { 449sub invoke_focus_in {
424 my ($self) = @_; 450 my ($self) = @_;
425 451
426 return if $FOCUS == $self; 452 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
428 454
429 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
430 456
431 $self->_emit (focus_in => $focus); 457 $self->update;
432 458
433 $focus->update if $focus; 459 0
434 $FOCUS->update;
435} 460}
436 461
437sub focus_out { 462sub invoke_focus_out {
438 my ($self) = @_; 463 my ($self) = @_;
439 464
440 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
441 466
442 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
443 468
444 $self->_emit (focus_out => $focus); 469 $self->update;
445 470
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 472 unless $FOCUS;
450}
451 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
452sub mouse_motion { 0 } 484sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 485sub invoke_button_up { 0 }
454sub key_down { 0 } 486sub invoke_key_down { 0 }
455sub key_up { 0 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
456 489
457sub button_down { 490sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
459 492
460 $self->focus_in; 493 $self->grab_focus;
461 494
462 0 495 0
496}
497
498sub connect {
499 my ($self, $signal, $cb) = @_;
500
501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
507}
508
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
515
516sub emit {
517 my ($self, $signal, @args) = @_;
518
519 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, either.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
528 #d##TODO# stop propagating at first true, do not use sum
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 532}
464 533
465sub find_widget { 534sub find_widget {
466 my ($self, $x, $y) = @_; 535 my ($self, $x, $y) = @_;
467 536
… …
477sub set_parent { 546sub set_parent {
478 my ($self, $parent) = @_; 547 my ($self, $parent) = @_;
479 548
480 Scalar::Util::weaken ($self->{parent} = $parent); 549 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 550 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 551}
506 552
507sub realloc { 553sub realloc {
508 my ($self) = @_; 554 my ($self) = @_;
509 555
… …
542 return unless $self->{h} && $self->{w}; 588 return unless $self->{h} && $self->{w};
543 589
544 # update screen rectangle 590 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 591 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 592 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 593
550 # skip widgets that are entirely outside the drawing area 594 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 597
… …
576 glVertex $self->{w} - 1, 0; 620 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 621 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 622 glVertex 0 , $self->{h} - 1;
579 glEnd; 623 glEnd;
580 glPopMatrix; 624 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 626 }
583 627
584 $self->_draw; 628 $self->_draw;
585 glPopMatrix; 629 glPopMatrix;
586} 630}
… …
592} 636}
593 637
594sub DESTROY { 638sub DESTROY {
595 my ($self) = @_; 639 my ($self) = @_;
596 640
641 return if CFPlus::in_destruct;
642
597 delete $WIDGET{$self+0}; 643 delete $WIDGET{$self+0};
598 644
599 eval { $self->destroy }; 645 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601} 647}
602 648
603############################################################################# 649#############################################################################
604 650
605package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
606 652
607our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
608 654
609use strict; 655use strict;
610use CFClient::OpenGL; 656use CFPlus::OpenGL;
611 657
612sub new { 658sub new {
613 my $class = shift; 659 my $class = shift;
614 660
615 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
646 } 692 }
647} 693}
648 694
649############################################################################# 695#############################################################################
650 696
651package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
652 698
653our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
654 700
655sub new { 701sub new {
656 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
658} 704}
… …
665 711
666sub draw { } 712sub draw { }
667 713
668############################################################################# 714#############################################################################
669 715
670package CFClient::UI::Container; 716package CFPlus::UI::Container;
671 717
672our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
673 719
674sub new { 720sub new {
675 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
676 722
677 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
686 if $children; 732 if $children;
687 733
688 $self 734 $self
689} 735}
690 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
691sub add { 745sub add {
692 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
693 747
694 $_->set_parent ($self) 748 $_->set_parent ($self)
695 for @widgets; 749 for @widgets;
… …
755 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
756} 810}
757 811
758############################################################################# 812#############################################################################
759 813
760package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
761 815
762our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
763 817
764sub new { 818sub new {
765 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
766 820
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 822
769 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
770} 824}
771 825
772sub add { 826sub add {
… …
779sub remove { 833sub remove {
780 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
781 835
782 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
783 837
784 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 839 unless @{$self->{children}};
786} 840}
787 841
788sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
789 843
790sub size_request { 844sub size_request {
791 $_[0]{children}[0]->size_request 845 $_[0]{children}[0]->size_request
792} 846}
793 847
794sub size_allocate { 848sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 849 my ($self, $w, $h) = @_;
796 850
797 $self->{children}[0]->configure (0, 0, $w, $h); 851 $self->{children}[0]->configure (0, 0, $w, $h);
852
853 1
798} 854}
799 855
800############################################################################# 856#############################################################################
801 857
802# back-buffered drawing area 858# back-buffered drawing area
803 859
804package CFClient::UI::Window; 860package CFPlus::UI::Window;
805 861
806our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
807 863
808use CFClient::OpenGL; 864use CFPlus::OpenGL;
809 865
810sub new { 866sub new {
811 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
812 868
813 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
818 874
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 875 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 876 $self->SUPER::update;
821} 877}
822 878
823sub size_allocate { 879sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 880 my ($self, $w, $h) = @_;
825 881
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 882 $self->update;
883
884 $self->SUPER::invoke_size_allocate ($w, $h)
828} 885}
829 886
830sub _render { 887sub _render {
831 my ($self) = @_; 888 my ($self) = @_;
832 889
… …
834} 891}
835 892
836sub render_child { 893sub render_child {
837 my ($self) = @_; 894 my ($self) = @_;
838 895
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
842 899
843 { 900 {
844 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
845 902
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
905
906 $self->_render;
848 } 907 }
849
850 $self->_render;
851 }; 908 };
852} 909}
853 910
854sub _draw { 911sub _draw {
855 my ($self) = @_; 912 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 913
859 my $tex = $self->{texture} 914 my $tex = $self->{texture}
860 or return; 915 or return;
861 916
862 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
865 920
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
867 922
868 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
869} 924}
870 925
871############################################################################# 926#############################################################################
872 927
873package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
874 929
875our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
876 931
877sub new { 932sub new {
878 my $class = shift; 933 my $class = shift;
879 934
880 $class->SUPER::new ( 935 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 948 $h = 10 if $self->{scroll_y};
894 949
895 ($w, $h) 950 ($w, $h)
896} 951}
897 952
898sub size_allocate { 953sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 954 my ($self, $w, $h) = @_;
900 955
901 my $child = $self->child; 956 my $child = $self->child;
902 957
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 960
906 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
907 $self->update; 962 $self->update;
963
964 1
908} 965}
909 966
910sub set_offset { 967sub set_offset {
911 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
912 969
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 997 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 999 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1001 }
945} 1002}
946 1003
947sub _render { 1004sub _render {
948 my ($self) = @_; 1005 my ($self) = @_;
949 1006
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1009
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1011
955 $self->SUPER::_render; 1012 $self->SUPER::_render;
956} 1013}
957 1014
958############################################################################# 1015#############################################################################
959 1016
960package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
961 1018
962our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
963 1020
964sub new { 1021sub new {
965 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
966 1023
967 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
968 1025
969 my $self; 1026 my $self;
970 1027
971 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1029 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1031 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
976 }, 1033 },
977 ; 1034 ;
978 1035
979 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
981 slider => $slider, 1039 slider => $slider,
982 %arg, 1040 %arg,
983 ); 1041 );
984 1042
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1044 $self->add ($child) if $child;
987 1045
988 $self 1046 $self
989} 1047}
990 1048
1049#TODO# update range on size_allocate depending on child
1050
991sub add { 1051sub add {
992 my ($self, $widget) = @_; 1052 my ($self, $widget) = @_;
993 1053
994 $self->{vp}->add ($self->{child} = $widget); 1054 $self->{vp}->add ($self->{child} = $widget);
995} 1055}
996 1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
1067sub update_slider {
1068 my ($self) = @_;
1069
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1071}
1072
997sub update { 1073sub update {
998 my ($self) = @_; 1074 my ($self) = @_;
999 1075
1000 $self->SUPER::update; 1076 $self->SUPER::update;
1001 1077
1002 # todo: overwrite size_allocate of child 1078 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1079}
1006 1080
1007sub size_allocate { 1081sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1082 my ($self, $w, $h) = @_;
1009 1083
1084 $self->update_slider;
1085
1010 $self->SUPER::size_allocate ($w, $h); 1086 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1087}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1088
1019############################################################################# 1089#############################################################################
1020 1090
1021package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1022 1092
1023our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1024 1094
1025use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1026 1096
1027sub new { 1097sub new {
1028 my $class = shift; 1098 my $class = shift;
1029 1099
1030 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1057} 1127}
1058 1128
1059############################################################################# 1129#############################################################################
1060 1130
1061package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1062 1132
1063our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1064 1134
1065use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1136
1137sub new {
1138 my ($class, %arg) = @_;
1139
1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1066 1236
1067my $bg = 1237my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1239 mipmap => 1, wrap => 1;
1070 1240
1071my @border = 1241my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1244
1075sub new { 1245sub new {
1076 my ($class, %arg) = @_; 1246 my ($class, %arg) = @_;
1077 1247
1078 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1249 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1250 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1251 border => 0.6,
1082 can_events => 1, 1252 can_events => 1,
1083 min_w => 16, 1253 min_w => 64,
1084 min_h => 16, 1254 min_h => 32,
1085 %arg, 1255 %arg,
1086 ); 1256 );
1087 1257
1088 $self->{title_widget} = new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1259 align => 0,
1090 valign => 1, 1260 valign => 1,
1091 text => $self->{title}, 1261 text => $self->{title},
1092 fontsize => $self->{border}, 1262 fontsize => $self->{border},
1093 if exists $self->{title}; 1263 if exists $self->{title};
1094 1264
1265 if ($self->{has_close_button}) {
1266 $self->{close_button} =
1267 new CFPlus::UI::ImageButton
1268 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") };
1270
1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1272 }
1273
1095 $self 1274 $self
1096} 1275}
1097 1276
1098sub add { 1277sub add {
1099 my ($self, @widgets) = @_; 1278 my ($self, @widgets) = @_;
1100 1279
1101 $self->SUPER::add (@widgets); 1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1283}
1104 1284
1105sub border { 1285sub border {
1106 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1107} 1287}
… …
1109sub size_request { 1289sub size_request {
1110 my ($self) = @_; 1290 my ($self) = @_;
1111 1291
1112 $self->{title_widget}->size_request 1292 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1293 if $self->{title_widget};
1294
1295 $self->{close_button}->size_request
1296 if $self->{close_button};
1114 1297
1115 my ($w, $h) = $self->SUPER::size_request; 1298 my ($w, $h) = $self->SUPER::size_request;
1116 1299
1117 ( 1300 (
1118 $w + $self->border * 2, 1301 $w + $self->border * 2,
1119 $h + $self->border * 2, 1302 $h + $self->border * 2,
1120 ) 1303 )
1121} 1304}
1122 1305
1123sub size_allocate { 1306sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1307 my ($self, $w, $h) = @_;
1125 1308
1126 if ($self->{title_widget}) { 1309 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1310 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1311 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1312 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1313 }
1131 1314
1132 my $border = $self->border; 1315 my $border = $self->border;
1133 1316
1134 $h -= List::Util::max 0, $border * 2; 1317 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1318 $w -= List::Util::max 0, $border * 2;
1319
1320 $self->child->configure ($border, $border, $w, $h);
1321
1322 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1323 if $self->{close_button};
1324
1325 1
1326}
1327
1328sub invoke_delete {
1329 my ($self) = @_;
1330
1331 $self->hide;
1136 1332
1137 $self->child->configure ($border, $border, $w, $h); 1333 1
1138} 1334}
1139 1335
1140sub button_down { 1336sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1337 my ($self, $ev, $x, $y) = @_;
1142 1338
1143 my ($w, $h) = @$self{qw(w h)}; 1339 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1340 my $border = $self->border;
1145 1341
… …
1176 1372
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1373 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1374
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1375 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1376 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1377 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1378 };
1183 } else { 1379 } else {
1184 return 0; 1380 return 0;
1185 } 1381 }
1186 1382
1187 1 1383 1
1188} 1384}
1189 1385
1190sub button_up { 1386sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1387 my ($self, $ev, $x, $y) = @_;
1192 1388
1193 !!delete $self->{motion} 1389 ! ! delete $self->{motion}
1194} 1390}
1195 1391
1196sub mouse_motion { 1392sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1198 1394
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1396
1201 !!$self->{motion} 1397 ! ! $self->{motion}
1398}
1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1202} 1406}
1203 1407
1204sub _draw { 1408sub _draw {
1205 my ($self) = @_; 1409 my ($self) = @_;
1206 1410
… …
1235 $child->draw; 1439 $child->draw;
1236 1440
1237 if ($self->{title_widget}) { 1441 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1442 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1443 $self->{title_widget}->_draw;
1444
1445 glTranslate 0, - ($border - $self->{h});
1240 } 1446 }
1447
1448 $self->{close_button}->draw
1449 if $self->{close_button};
1241} 1450}
1242 1451
1243############################################################################# 1452#############################################################################
1244 1453
1245package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1246 1455
1247our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1248 1457
1249use List::Util qw(max sum); 1458use List::Util qw(max sum);
1250 1459
1251use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1252 1461
1253sub new { 1462sub new {
1254 my $class = shift; 1463 my $class = shift;
1255 1464
1256 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1262sub children { 1471sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1473}
1265 1474
1266sub add { 1475sub add {
1267 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1268 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1480 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1271 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1486 $self->realloc;
1273} 1487}
1274 1488
1275sub remove { 1489sub remove {
1276 my ($self, $child) = @_; 1490 my ($self, $child) = @_;
… …
1324 (sum @$ws), 1538 (sum @$ws),
1325 (sum @$hs), 1539 (sum @$hs),
1326 ) 1540 )
1327} 1541}
1328 1542
1329sub size_allocate { 1543sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1331 1545
1332 my ($ws, $hs) = $self->get_wh; 1546 my ($ws, $hs) = $self->get_wh;
1333 1547
1334 my $req_w = (sum @$ws) || 1; 1548 my $req_w = (sum @$ws) || 1;
… …
1341 1555
1342 # linearly scale sizes 1556 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1559
1346 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1347 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1348 1562
1349 my $y; 1563 my $y;
1350 1564
1351 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1352 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1366 } 1580 }
1367 1581
1368 $y += $row_h; 1582 $y += $row_h;
1369 } 1583 }
1370 1584
1585 1
1371} 1586}
1372 1587
1373sub find_widget { 1588sub find_widget {
1374 my ($self, $x, $y) = @_; 1589 my ($self, $x, $y) = @_;
1375 1590
… …
1394 } 1609 }
1395} 1610}
1396 1611
1397############################################################################# 1612#############################################################################
1398 1613
1399package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1400 1615
1401our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1402 1617
1403sub size_request { 1618sub size_request {
1404 my ($self) = @_; 1619 my ($self) = @_;
1405 1620
1406 $self->{vertical} 1621 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1628 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1629 )
1415} 1630}
1416 1631
1417sub size_allocate { 1632sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1633 my ($self, $w, $h) = @_;
1419 1634
1420 my $space = $self->{vertical} ? $h : $w; 1635 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1636 my @children = $self->visible_children;
1422 1637
1423 my @req; 1638 my @req;
1424 1639
1425 if ($self->{homogeneous}) { 1640 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1641 @req = ($space / (@children || 1)) x @children;
1427 } else { 1642 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1643 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1644 my $req = List::Util::sum @req;
1430 1645
1431 if ($req > $space) { 1646 if ($req > $space) {
1432 # ah well, not enough space 1647 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1648 $_ *= $space / $req for @req;
1434 } else { 1649 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1650 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1651
1437 $space = ($space - $req) / $expand; # remaining space to give away 1652 $space = ($space - $req) / $expand; # remaining space to give away
1438 1653
1439 $req[$_] += $space * $children->[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1655 for 0 .. $#children;
1441 } 1656 }
1442 } 1657 }
1443 1658
1444 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1445 1660
1446 my $pos = 0; 1661 my $pos = 0;
1447 for (0 .. $#$children) { 1662 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1665
1451 $pos += $alloc; 1666 $pos += $alloc;
1452 } 1667 }
1453 1668
1454 1 1669 1
1455} 1670}
1456 1671
1457############################################################################# 1672#############################################################################
1458 1673
1459package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1460 1675
1461our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1462 1677
1463sub new { 1678sub new {
1464 my $class = shift; 1679 my $class = shift;
1465 1680
1466 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1469 ) 1684 )
1470} 1685}
1471 1686
1472############################################################################# 1687#############################################################################
1473 1688
1474package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1475 1690
1476our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1477 1692
1478sub new { 1693sub new {
1479 my $class = shift; 1694 my $class = shift;
1480 1695
1481 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1484 ) 1699 )
1485} 1700}
1486 1701
1487############################################################################# 1702#############################################################################
1488 1703
1489package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1490 1705
1491our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1492 1707
1493use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1494 1709
1495sub new { 1710sub new {
1496 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1497 1712
1498 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1716 #active_bg => none
1502 #font => default_font 1717 #font => default_font
1503 #text => initial text 1718 #text => initial text
1504 #markup => initial narkup 1719 #markup => initial narkup
1505 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1506 ellipsise => 3, # end 1722 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1724 fontsize => 1,
1509 align => -1, 1725 align => -1,
1510 valign => -1, 1726 valign => -1,
1511 padding_x => 2, 1727 padding_x => 2,
1512 padding_y => 2, 1728 padding_y => 2,
1513 can_events => 0, 1729 can_events => 0,
1514 %arg 1730 %arg
1515 ); 1731 );
1516 1732
1517 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1736 $self->{template} = $layout;
1521 } 1737 }
1522 1738
1523 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1527 } 1743 }
1528 1744
1529 $self 1745 $self
1530} 1746}
1531 1747
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1748sub update {
1543 my ($self) = @_; 1749 my ($self) = @_;
1544 1750
1545 delete $self->{texture}; 1751 delete $self->{texture};
1546 $self->SUPER::update; 1752 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1558 1764
1559 return if $self->{text} eq "T$text"; 1765 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1766 $self->{text} = "T$text";
1561 1767
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1768 $self->{layout}->set_text ($text);
1564 1769
1565 delete $self->{size_req}; 1770 delete $self->{size_req};
1566 $self->realloc; 1771 $self->realloc;
1567 $self->update; 1772 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1778 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1779 $self->{text} = "M$markup";
1575 1780
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1781 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1782
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1783 $self->{layout}->set_markup ($markup);
1580 1784
1581 delete $self->{size_req}; 1785 delete $self->{size_req};
1582 $self->realloc; 1786 $self->realloc;
1583 $self->update; 1787 $self->update;
… …
1595 1799
1596 my ($w, $h) = $self->{layout}->size; 1800 my ($w, $h) = $self->{layout}->size;
1597 1801
1598 if (exists $self->{template}) { 1802 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1803 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1806
1602 my ($w2, $h2) = $self->{template}->size; 1807 my ($w2, $h2) = $self->{template}->size;
1603 1808
1604 $w = List::Util::max $w, $w2; 1809 $w = List::Util::max $w, $w2;
… …
1609 }; 1814 };
1610 1815
1611 @{ $self->{size_req} } 1816 @{ $self->{size_req} }
1612} 1817}
1613 1818
1819sub baseline_shift {
1820 $_[0]{layout}->descent
1821}
1822
1614sub size_allocate { 1823sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
1616 1825
1617 delete $self->{ox}; 1826 delete $self->{ox};
1618 1827
1619 delete $self->{texture} 1828 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1829 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1830
1831 1
1621} 1832}
1622 1833
1623sub set_fontsize { 1834sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1835 my ($self, $fontsize) = @_;
1625 1836
1626 $self->{fontsize} = $fontsize; 1837 $self->{fontsize} = $fontsize;
1838 delete $self->{size_req};
1627 delete $self->{texture}; 1839 delete $self->{texture};
1628 1840
1629 $self->realloc; 1841 $self->realloc;
1630} 1842}
1631 1843
1632sub reconfigure { 1844sub reconfigure {
1633 my ($self) = @_; 1845 my ($self) = @_;
1634 1846
1635 delete $self->{size_req}; 1847 delete $self->{size_req};
1848 delete $self->{texture};
1636 1849
1637 $self->SUPER::reconfigure; 1850 $self->SUPER::reconfigure;
1638} 1851}
1639 1852
1640sub _draw { 1853sub _draw {
1641 my ($self) = @_; 1854 my ($self) = @_;
1642 1855
1643 $self->SUPER::_draw; # draw background, if applicable 1856 $self->SUPER::_draw; # draw background, if applicable
1644 1857
1645 my $tex = $self->{texture} ||= do { 1858 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1859 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1860 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1861 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1862 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1863 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1864 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1865
1653 new_from_layout CFClient::Texture $self->{layout} 1866 [$self->{layout}->size]
1654 }; 1867 };
1655 1868
1656 unless (exists $self->{ox}) { 1869 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1872 : ($self->{w} - $size->[0]) * 0.5);
1660 1873
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1876 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1877 };
1665 1878
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1881
1671 if ($tex->{format} == GL_ALPHA) { 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 1883}
1682 1884
1683############################################################################# 1885#############################################################################
1684 1886
1685package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1686 1888
1687our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1688 1890
1689use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1690 1892
1691sub new { 1893sub new {
1692 my $class = shift; 1894 my $class = shift;
1693 1895
1694 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1718 1920
1719 $text =~ s/./*/g if $self->{hidden}; 1921 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1922 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1923 delete $self->{size_req};
1722 1924
1723 $self->_emit (changed => $self->{text}); 1925 $self->emit (changed => $self->{text});
1724 1926
1725 $self->realloc; 1927 $self->realloc;
1726 $self->update; 1928 $self->update;
1727} 1929}
1728 1930
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1945 my ($w, $h) = $self->SUPER::size_request;
1744 1946
1745 ($w + 1, $h) # add 1 for cursor 1947 ($w + 1, $h) # add 1 for cursor
1746} 1948}
1747 1949
1748sub key_down { 1950sub invoke_key_down {
1749 my ($self, $ev) = @_; 1951 my ($self, $ev) = @_;
1750 1952
1751 my $mod = $ev->{mod}; 1953 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1954 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1955 my $uni = $ev->{unicode};
… …
1756 1958
1757 if ($uni == 8) { 1959 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 1961 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 1962 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 1963 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 1964 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 1965 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1766 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1768 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = "";
1973 $self->{cursor} = 0;
1769 } elsif ($uni == 27) { 1974 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1975 $self->emit ('escape');
1771 } elsif ($uni) { 1976 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1977 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1978 } else {
1774 return 0; 1979 return 0;
1775 } 1980 }
… …
1779 $self->realloc; 1984 $self->realloc;
1780 1985
1781 1 1986 1
1782} 1987}
1783 1988
1784sub focus_in { 1989sub invoke_focus_in {
1785 my ($self) = @_; 1990 my ($self) = @_;
1786 1991
1787 $self->{last_activity} = $::NOW; 1992 $self->{last_activity} = $::NOW;
1788 1993
1789 $self->SUPER::focus_in; 1994 $self->SUPER::invoke_focus_in
1790} 1995}
1791 1996
1792sub button_down { 1997sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1794 1999
1795 $self->SUPER::button_down ($ev, $x, $y); 2000 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2001
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2002 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2003
1799 # byte-index to char-index 2004 # byte-index to char-index
1800 my $text = $self->{text}; 2005 my $text = $self->{text};
1801 utf8::encode $text; 2006 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2007 $self->{cursor} = length $text;
1803 2008
1804 $self->_set_text ($self->{text}); 2009 $self->_set_text ($self->{text});
1805 $self->update; 2010 $self->update;
1806 2011
1807 1 2012 1
1808} 2013}
1809 2014
1810sub mouse_motion { 2015sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2016 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2017# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 2018
1814 0 2019 1
1815} 2020}
1816 2021
1817sub _draw { 2022sub _draw {
1818 my ($self) = @_; 2023 my ($self) = @_;
1819 2024
… …
1846 utf8::encode $text; 2051 utf8::encode $text;
1847 2052
1848 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2053 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849 } 2054 }
1850 2055
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2056 glBegin GL_LINES;
1853 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2057 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 2059 glEnd;
1856 } 2060 }
1857} 2061}
1858 2062
1859package CFClient::UI::Entry; 2063package CFPlus::UI::Entry;
1860 2064
1861our @ISA = CFClient::UI::EntryBase::; 2065our @ISA = CFPlus::UI::EntryBase::;
1862 2066
1863use CFClient::OpenGL; 2067use CFPlus::OpenGL;
1864 2068
1865sub key_down { 2069sub invoke_key_down {
1866 my ($self, $ev) = @_; 2070 my ($self, $ev) = @_;
1867 2071
1868 my $sym = $ev->{sym}; 2072 my $sym = $ev->{sym};
1869 2073
1870 if ($sym == 13) { 2074 if ($sym == 13) {
1871 unshift @{$self->{history}}, 2075 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2076 my $txt = $self->get_text;
2077
1873 $self->{history_pointer} = -1; 2078 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2079 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2080 $self->emit (activate => $txt);
1876 $self->update; 2081 $self->update;
1877 2082
1878 } elsif ($sym == CFClient::SDLK_UP) { 2083 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2084 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2085 $self->{history_saveback} = $self->get_text;
1881 } 2086 }
1882 if (@{$self->{history} || []} > 0) { 2087 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2088 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2090 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2091 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2092 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2093 }
1889 2094
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2095 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2096 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2098
1894 if ($self->{history_pointer} >= 0) { 2099 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2100 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2101 } else {
1897 $self->set_text ($self->{history_saveback}); 2102 $self->set_text ($self->{history_saveback});
1898 } 2103 }
1899 2104
1900 } else { 2105 } else {
1901 return $self->SUPER::key_down ($ev) 2106 return $self->SUPER::invoke_key_down ($ev)
1902 } 2107 }
1903 2108
1904 1 2109 1
1905} 2110}
1906 2111
1907############################################################################# 2112#############################################################################
1908 2113
1909package CFClient::UI::Button; 2114package CFPlus::UI::Button;
1910 2115
1911our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1912 2117
1913use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1914 2119
1915my @tex = 2120my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2122 qw(b1_button_active.png);
1918 2123
1919sub new { 2124sub new {
1920 my $class = shift; 2125 my $class = shift;
1921 2126
… …
1930 can_events => 1, 2135 can_events => 1,
1931 @_ 2136 @_
1932 ) 2137 )
1933} 2138}
1934 2139
1935sub activate { }
1936
1937sub button_up { 2140sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
1939 2142
1940 $self->emit ("activate") 2143 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2144 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2145 && $y >= 0 && $y < $self->{h};
… …
1960 $self->SUPER::_draw; 2163 $self->SUPER::_draw;
1961} 2164}
1962 2165
1963############################################################################# 2166#############################################################################
1964 2167
1965package CFClient::UI::CheckBox; 2168package CFPlus::UI::CheckBox;
1966 2169
1967our @ISA = CFClient::UI::DrawBG::; 2170our @ISA = CFPlus::UI::DrawBG::;
1968 2171
1969my @tex = 2172my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2173 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2174 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2175
1973use CFClient::OpenGL; 2176use CFPlus::OpenGL;
1974 2177
1975sub new { 2178sub new {
1976 my $class = shift; 2179 my $class = shift;
1977 2180
1978 $class->SUPER::new ( 2181 $class->SUPER::new (
… …
1992 my ($self) = @_; 2195 my ($self) = @_;
1993 2196
1994 (6) x 2 2197 (6) x 2
1995} 2198}
1996 2199
2200sub toggle {
2201 my ($self) = @_;
2202
2203 $self->{state} = !$self->{state};
2204 $self->emit (changed => $self->{state});
2205 $self->update;
2206}
2207
1997sub button_down { 2208sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1999 2210
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2211 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2212 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2213 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2214 } else {
2005 return 0 2215 return 0
2006 } 2216 }
2007 2217
2008 1 2218 1
… …
2028 glDisable GL_TEXTURE_2D; 2238 glDisable GL_TEXTURE_2D;
2029} 2239}
2030 2240
2031############################################################################# 2241#############################################################################
2032 2242
2033package CFClient::UI::Image; 2243package CFPlus::UI::Image;
2034 2244
2035our @ISA = CFClient::UI::Base::; 2245our @ISA = CFPlus::UI::Base::;
2036 2246
2037use CFClient::OpenGL; 2247use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2248
2040our %loaded_images; 2249our %texture_cache;
2041 2250
2042sub new { 2251sub new {
2043 my $class = shift; 2252 my $class = shift;
2044 2253
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2254 my $self = $class->SUPER::new (
2255 can_events => 0,
2256 @_,
2257 );
2046 2258
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2259 $self->{path} || $self->{tex}
2260 or Carp::croak "'path' or 'tex' attributes required";
2048 2261
2049 $loaded_images{$self->{image}} ||= 2262 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2264
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2265 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2266
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2268
2058 $self 2269 $self
2059} 2270}
2060 2271
2272sub STORABLE_freeze {
2273 my ($self, $cloning) = @_;
2274
2275 $self->{path}
2276 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2277
2278 $self->{path}
2279}
2280
2281sub STORABLE_attach {
2282 my ($self, $cloning, $path) = @_;
2283
2284 $self->new (path => $path)
2285}
2286
2061sub size_request { 2287sub size_request {
2062 my ($self) = @_; 2288 my ($self) = @_;
2063 2289
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2290 ($self->{tex}{w}, $self->{tex}{h})
2065} 2291}
2066 2292
2067sub _draw { 2293sub _draw {
2068 my ($self) = @_; 2294 my ($self) = @_;
2069 2295
… …
2079 } 2305 }
2080 2306
2081 glEnable GL_TEXTURE_2D; 2307 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2309
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2310 $tex->draw_quad (0, 0, $w, $h);
2085 2311
2086 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
2087} 2313}
2088 2314
2089############################################################################# 2315#############################################################################
2090 2316
2317package CFPlus::UI::ImageButton;
2318
2319our @ISA = CFPlus::UI::Image::;
2320
2321use CFPlus::OpenGL;
2322
2323my %textures;
2324
2325sub new {
2326 my $class = shift;
2327
2328 my $self = $class->SUPER::new (
2329 padding_x => 4,
2330 padding_y => 4,
2331 fg => [1, 1, 1],
2332 active_fg => [0, 0, 1],
2333 can_hover => 1,
2334 align => 0,
2335 valign => 0,
2336 can_events => 1,
2337 @_
2338 );
2339}
2340
2341sub invoke_button_up {
2342 my ($self, $ev, $x, $y) = @_;
2343
2344 $self->emit ("activate")
2345 if $x >= 0 && $x < $self->{w}
2346 && $y >= 0 && $y < $self->{h};
2347
2348 1
2349}
2350
2351#############################################################################
2352
2091package CFClient::UI::VGauge; 2353package CFPlus::UI::VGauge;
2092 2354
2093our @ISA = CFClient::UI::Base::; 2355our @ISA = CFPlus::UI::Base::;
2094 2356
2095use List::Util qw(min max); 2357use List::Util qw(min max);
2096 2358
2097use CFClient::OpenGL; 2359use CFPlus::OpenGL;
2098 2360
2099my %tex = ( 2361my %tex = (
2100 food => [ 2362 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2365 ],
2104 grace => [ 2366 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2368 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2369 ],
2108 hp => [ 2370 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2373 ],
2112 mana => [ 2374 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2375 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2376 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2377 ],
2116); 2378);
2117 2379
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2380# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2440 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2441 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2442
2181 my $h1 = $self->{h} * (1 - $ycut1); 2443 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2444 my $h2 = $self->{h} * (1 - $ycut2);
2445 my $h3 = $self->{h};
2446
2447 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2448
2184 glEnable GL_BLEND; 2449 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2450 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2451 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
… …
2206 2471
2207 if ($t3) { 2472 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2473 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2474 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2475 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2476 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2477 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2478 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2479 glEnd;
2215 } 2480 }
2216 2481
2217 glDisable GL_BLEND; 2482 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2483 glDisable GL_TEXTURE_2D;
2219} 2484}
2220 2485
2221############################################################################# 2486#############################################################################
2222 2487
2223package CFClient::UI::Gauge; 2488package CFPlus::UI::Gauge;
2224 2489
2225our @ISA = CFClient::UI::VBox::; 2490our @ISA = CFPlus::UI::VBox::;
2226 2491
2227sub new { 2492sub new {
2228 my ($class, %arg) = @_; 2493 my ($class, %arg) = @_;
2229 2494
2230 my $self = $class->SUPER::new ( 2495 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2497 can_hover => 1,
2233 can_events => 1, 2498 can_events => 1,
2234 %arg, 2499 %arg,
2235 ); 2500 );
2236 2501
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2502 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2503 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2504 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2505
2241 $self 2506 $self
2242} 2507}
2243 2508
2244sub set_fontsize { 2509sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2530 $self->{value}->set_text ($val);
2266} 2531}
2267 2532
2268############################################################################# 2533#############################################################################
2269 2534
2270package CFClient::UI::Slider; 2535package CFPlus::UI::Slider;
2271 2536
2272use strict; 2537use strict;
2273 2538
2274use CFClient::OpenGL; 2539use CFPlus::OpenGL;
2275 2540
2276our @ISA = CFClient::UI::DrawBG::; 2541our @ISA = CFPlus::UI::DrawBG::;
2277 2542
2278my @tex = 2543my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2545 qw(s1_slider.png s1_slider_bg.png);
2281 2546
2282sub new { 2547sub new {
2283 my $class = shift; 2548 my $class = shift;
2284 2549
… …
2305 $self->update; 2570 $self->update;
2306 2571
2307 $self 2572 $self
2308} 2573}
2309 2574
2310sub changed { }
2311
2312sub set_range { 2575sub set_range {
2313 my ($self, $range) = @_; 2576 my ($self, $range) = @_;
2314 2577
2315 ($range, $self->{range}) = ($self->{range}, $range); 2578 ($range, $self->{range}) = ($self->{range}, $range);
2316 2579
… …
2336 if $unit; 2599 if $unit;
2337 2600
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2601 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2602
2340 if ($value != $old_value) { 2603 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2604 $self->emit (changed => $value);
2342 $self->update; 2605 $self->update;
2343 } 2606 }
2344} 2607}
2345 2608
2346sub size_request { 2609sub size_request {
2347 my ($self) = @_; 2610 my ($self) = @_;
2348 2611
2349 ($self->{req_w}, $self->{req_h}) 2612 ($self->{req_w}, $self->{req_h})
2350} 2613}
2351 2614
2352sub button_down { 2615sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2616 my ($self, $ev, $x, $y) = @_;
2354 2617
2355 $self->SUPER::button_down ($ev, $x, $y); 2618 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2619
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2620 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2621
2359 $self->mouse_motion ($ev, $x, $y) 2622 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2623}
2361 2624
2362sub mouse_motion { 2625sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2626 my ($self, $ev, $x, $y) = @_;
2364 2627
2365 if ($GRAB == $self) { 2628 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2629 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2630
… …
2373 } else { 2636 } else {
2374 return 0; 2637 return 0;
2375 } 2638 }
2376 2639
2377 1 2640 1
2641}
2642
2643sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_;
2645
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2649
2650 ! ! $delta
2378} 2651}
2379 2652
2380sub update { 2653sub update {
2381 my ($self) = @_; 2654 my ($self) = @_;
2382 2655
… …
2431 glDisable GL_TEXTURE_2D; 2704 glDisable GL_TEXTURE_2D;
2432} 2705}
2433 2706
2434############################################################################# 2707#############################################################################
2435 2708
2436package CFClient::UI::ValSlider; 2709package CFPlus::UI::ValSlider;
2437 2710
2438our @ISA = CFClient::UI::HBox::; 2711our @ISA = CFPlus::UI::HBox::;
2439 2712
2440sub new { 2713sub new {
2441 my ($class, %arg) = @_; 2714 my ($class, %arg) = @_;
2442 2715
2443 my $range = delete $arg{range}; 2716 my $range = delete $arg{range};
2444 2717
2445 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2721 to_value => sub { shift },
2449 from_value => sub { shift }, 2722 from_value => sub { shift },
2450 %arg, 2723 %arg,
2451 ); 2724 );
2452 2725
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2745sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2746sub set_value { shift->{slider}->set_value (@_) }
2474 2747
2475############################################################################# 2748#############################################################################
2476 2749
2477package CFClient::UI::TextScroller; 2750package CFPlus::UI::TextScroller;
2478 2751
2479our @ISA = CFClient::UI::HBox::; 2752our @ISA = CFPlus::UI::HBox::;
2480 2753
2481use CFClient::OpenGL; 2754use CFPlus::OpenGL;
2482 2755
2483sub new { 2756sub new {
2484 my $class = shift; 2757 my $class = shift;
2485 2758
2486 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
2487 fontsize => 1, 2760 fontsize => 1,
2488 can_events => 0, 2761 can_events => 1,
2489 indent => 0, 2762 indent => 0,
2490 #font => default_font 2763 #font => default_font
2491 @_, 2764 @_,
2492 2765
2493 layout => (new CFClient::Layout 1), 2766 layout => (new CFPlus::Layout),
2494 par => [], 2767 par => [],
2495 height => 0, 2768 height => 0,
2496 children => [ 2769 children => [
2497 (new CFClient::UI::Empty expand => 1), 2770 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2771 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2772 ],
2500 ); 2773 );
2501 2774
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 2775 $self->{children}[1]->connect (changed => sub { $self->update });
2503 2776
… …
2509 2782
2510 $self->{fontsize} = $fontsize; 2783 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2784 $self->reflow;
2512} 2785}
2513 2786
2787sub size_request {
2788 my ($self) = @_;
2789
2790 my ($empty, $slider) = @{ $self->{children} };
2791
2792 local $self->{children} = [$empty, $slider];
2793 $self->SUPER::size_request
2794}
2795
2514sub size_allocate { 2796sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2797 my ($self, $w, $h) = @_;
2516 2798
2517 $self->SUPER::size_allocate ($w, $h); 2799 my ($empty, $slider, @other) = @{ $self->{children} };
2800 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2801
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2802 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2803 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2804 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2805 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2806
2524 $self->reflow; 2807 $self->reflow;
2525}
2526 2808
2527sub text_size { 2809 local $self->{children} = [$empty, $slider];
2810 $self->SUPER::invoke_size_allocate ($w, $h)
2811}
2812
2813sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 2814 my ($self, $ev) = @_;
2815
2816 return 0 unless $ev->{dy}; # only vertical movements
2817
2818 $self->{children}[1]->emit (mouse_wheel => $ev);
2819
2820 1
2821}
2822
2823sub get_layout {
2824 my ($self, $para) = @_;
2529 2825
2530 my $layout = $self->{layout}; 2826 my $layout = $self->{layout};
2531 2827
2828 $layout->set_font ($self->{font}) if $self->{font};
2829 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2830 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2831 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2832 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2833 $layout->set_markup ($para->{markup});
2834
2835 $layout->set_shapes (
2836 map
2837 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2838 @{$para->{widget}}
2536 2839 );
2840
2537 $layout->size 2841 $layout
2538} 2842}
2539 2843
2540sub reflow { 2844sub reflow {
2541 my ($self) = @_; 2845 my ($self) = @_;
2542 2846
… …
2549 2853
2550 # todo: base offset on lines or so, not on pixels 2854 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 2855 $self->{children}[1]->set_value ($offset);
2552} 2856}
2553 2857
2858sub current_paragraph {
2859 my ($self) = @_;
2860
2861 $self->{top_paragraph} - 1
2862}
2863
2864sub scroll_to {
2865 my ($self, $para) = @_;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868
2869 $self->{scroll_to} = $para;
2870 $self->update;
2871}
2872
2554sub clear { 2873sub clear {
2555 my ($self) = @_; 2874 my ($self) = @_;
2875
2876 my (undef, undef, @other) = @{ $self->{children} };
2877 $self->remove ($_) for @other;
2556 2878
2557 $self->{par} = []; 2879 $self->{par} = [];
2558 $self->{height} = 0; 2880 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2881 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2882}
2561 2883
2562sub add_paragraph { 2884sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2885 my $self = shift;
2564 2886
2565 for my $line (split /\n/, $text) { 2887 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 2888 $para = {
2889 fg => [1, 1, 1, 1],
2890 indent => 0,
2891 markup => "",
2892 widget => [],
2893 ref $para ? %$para : (markup => $para),
2894 w => 1e10,
2895 wrapped => 1,
2896 };
2897
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para;
2900 }
2901
2902 $self->{need_reflow}++;
2903 $self->update;
2904}
2905
2906sub scroll_to_bottom {
2907 my ($self) = @_;
2908
2909 $self->{scroll_to} = $#{$self->{par}};
2910 $self->update;
2911}
2912
2913sub force_uptodate {
2914 my ($self) = @_;
2915
2916 if (delete $self->{need_reflow}) {
2917 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2918
2919 my $height = 0;
2920
2921 for my $para (@{$self->{par}}) {
2922 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2923 my $layout = $self->get_layout ($para);
2924 my ($w, $h) = $layout->size;
2925
2926 $para->{w} = $w + $para->{indent};
2927 $para->{h} = $h;
2928 $para->{wrapped} = $layout->has_wrapped;
2929 }
2930
2931 $para->{y} = $height;
2932 $height += $para->{h};
2933 }
2934
2567 $self->{height} += $h; 2935 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2936 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 2937
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2938 delete $self->{texture};
2939 }
2940
2941 if (my $paridx = delete $self->{scroll_to}) {
2942 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2943 }
2572} 2944}
2573 2945
2574sub update { 2946sub update {
2575 my ($self) = @_; 2947 my ($self) = @_;
2576 2948
… …
2579 return unless $self->{h} > 0; 2951 return unless $self->{h} > 0;
2580 2952
2581 delete $self->{texture}; 2953 delete $self->{texture};
2582 2954
2583 $ROOT->on_post_alloc ($self => sub { 2955 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate;
2957
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2959
2586 if (delete $self->{need_reflow}) {
2587 my $height = 0;
2588
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2605
2606 $self->{height} = $height;
2607
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610 delete $self->{texture};
2611 }
2612
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2961 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2962 glClear GL_COLOR_BUFFER_BIT;
2616 2963
2964 package CFPlus::UI::Base;
2965 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2966 (0, 0, $self->{w}, $self->{h});
2967
2968 my $top = int $self->{children}[1]{range}[0];
2969
2970 my $paridx = 0;
2971 my $top_paragraph;
2617 my $top = int $self->{children}[1]{range}[0]; 2972 my $top = int $self->{children}[1]{range}[0];
2618 2973
2619 my $y0 = $top; 2974 my $y0 = $top;
2620 my $y1 = $top + $H; 2975 my $y1 = $top + $H;
2621 2976
2622 my $y = 0;
2623
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 2977 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2978 my $h = $para->{h};
2979 my $y = $para->{y};
2634 2980
2635 if ($y0 < $y + $h && $y < $y1) { 2981 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 2982 my $layout = $self->get_layout ($para);
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 2983
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2984 $layout->render ($para->{indent}, $y - $y0);
2642 2985
2643 glRasterPos $par->[3], $y - $y0; 2986 if (my @w = @{ $para->{widget} }) {
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2987 my @s = $layout->get_shapes;
2988
2989 for (@w) {
2990 my ($dx, $dy) = splice @s, 0, 2, ();
2991
2992 $_->{x} = $dx + $para->{indent};
2993 $_->{y} = $dy + $y - $y0;
2994
2995 $_->draw;
2996 }
2997 }
2645 } 2998 }
2646 2999
2647 $y += $h; 3000 $paridx++;
3001 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3002 }
2649 3003
2650 glDisable GL_BLEND; 3004 $self->{top_paragraph} = $top_paragraph;
2651 }; 3005 };
2652 }); 3006 });
3007}
3008
3009sub reconfigure {
3010 my ($self) = @_;
3011
3012 $self->SUPER::reconfigure;
3013
3014 $_->{w} = 1e10 for @{ $self->{par} };
3015 $self->reflow;
2653} 3016}
2654 3017
2655sub _draw { 3018sub _draw {
2656 my ($self) = @_; 3019 my ($self) = @_;
2657 3020
… …
2660 glColor 0, 0, 0, 1; 3023 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3024 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2663 3026
2664 $self->{children}[1]->draw; 3027 $self->{children}[1]->draw;
2665
2666} 3028}
2667 3029
2668############################################################################# 3030#############################################################################
2669 3031
2670package CFClient::UI::Animator; 3032package CFPlus::UI::Animator;
2671 3033
2672use CFClient::OpenGL; 3034use CFPlus::OpenGL;
2673 3035
2674our @ISA = CFClient::UI::Bin::; 3036our @ISA = CFPlus::UI::Bin::;
2675 3037
2676sub moveto { 3038sub moveto {
2677 my ($self, $x, $y) = @_; 3039 my ($self, $x, $y) = @_;
2678 3040
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3041 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3069 glPopMatrix;
2708} 3070}
2709 3071
2710############################################################################# 3072#############################################################################
2711 3073
2712package CFClient::UI::Flopper; 3074package CFPlus::UI::Flopper;
2713 3075
2714our @ISA = CFClient::UI::Button::; 3076our @ISA = CFPlus::UI::Button::;
2715 3077
2716sub new { 3078sub new {
2717 my $class = shift; 3079 my $class = shift;
2718 3080
2719 my $self = $class->SUPER::new ( 3081 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3093 $self->{other}->toggle_visibility;
2732} 3094}
2733 3095
2734############################################################################# 3096#############################################################################
2735 3097
2736package CFClient::UI::Tooltip; 3098package CFPlus::UI::Tooltip;
2737 3099
2738our @ISA = CFClient::UI::Bin::; 3100our @ISA = CFPlus::UI::Bin::;
2739 3101
2740use CFClient::OpenGL; 3102use CFPlus::OpenGL;
2741 3103
2742sub new { 3104sub new {
2743 my $class = shift; 3105 my $class = shift;
2744 3106
2745 $class->SUPER::new ( 3107 $class->SUPER::new (
… …
2748 ) 3110 )
2749} 3111}
2750 3112
2751sub set_tooltip_from { 3113sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3114 my ($self, $widget) = @_;
3115
3116 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3117 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3118
2754 my $tooltip = $widget->{tooltip}; 3119 my $tooltip = $widget->{tooltip};
2755 3120
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3121 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3122 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3126 }
2762 3127
2763 $tooltip =~ s/^\n+//; 3128 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3129 $tooltip =~ s/\n+$//;
2765 3130
2766 $self->add (new CFClient::UI::Label 3131 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3132 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3133 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3134 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3135 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3136 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3137 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3138 );
2774} 3139}
2775 3140
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3144 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3145
2781 ($w + 4, $h + 4) 3146 ($w + 4, $h + 4)
2782} 3147}
2783 3148
2784sub size_allocate { 3149sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3150 my ($self, $w, $h) = @_;
2786 3151
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3152 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3153}
2789 3154
2790sub visibility_change { 3155sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3156 my ($self, $visible) = @_;
2792 3157
2793 return unless $visible; 3158 return unless $visible;
2794 3159
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3160 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3161 my $widget = $self->{owner}
2797 or return; 3162 or return;
2798 3163
3164 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3165 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3166
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3167 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3168 if $x + $self->{w} > $self->{root}{w};
2803 3169
2804 $self->move_abs ($x, $y); 3170 $self->move_abs ($x, $y);
3171 } else {
3172 $self->hide;
3173 }
2805 }); 3174 });
2806} 3175}
2807 3176
2808sub _draw { 3177sub _draw {
2809 my ($self) = @_; 3178 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3202 $self->SUPER::_draw;
2834} 3203}
2835 3204
2836############################################################################# 3205#############################################################################
2837 3206
2838package CFClient::UI::Face; 3207package CFPlus::UI::Face;
2839 3208
2840our @ISA = CFClient::UI::Base::; 3209our @ISA = CFPlus::UI::DrawBG::;
2841 3210
2842use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2843 3212
2844sub new { 3213sub new {
2845 my $class = shift; 3214 my $class = shift;
2846 3215
2847 my $self = $class->SUPER::new ( 3216 my $self = $class->SUPER::new (
… …
2882sub _draw { 3251sub _draw {
2883 my ($self) = @_; 3252 my ($self) = @_;
2884 3253
2885 return unless $::CONN; 3254 return unless $::CONN;
2886 3255
3256 $self->SUPER::_draw;
3257
2887 my $face; 3258 my $face;
2888 3259
2889 if ($self->{frame}) { 3260 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3261 my $anim = $::CONN->{anim}[$self->{anim}];
2891 3262
… …
2913 $self->SUPER::destroy; 3284 $self->SUPER::destroy;
2914} 3285}
2915 3286
2916############################################################################# 3287#############################################################################
2917 3288
2918package CFClient::UI::Buttonbar; 3289package CFPlus::UI::Buttonbar;
2919 3290
2920our @ISA = CFClient::UI::HBox::; 3291our @ISA = CFPlus::UI::HBox::;
2921 3292
2922# TODO: should actualyl wrap buttons and other goodies. 3293# TODO: should actually wrap buttons and other goodies.
2923 3294
2924############################################################################# 3295#############################################################################
2925 3296
2926package CFClient::UI::Menu; 3297package CFPlus::UI::Menu;
2927 3298
2928our @ISA = CFClient::UI::FancyFrame::; 3299our @ISA = CFPlus::UI::Toplevel::;
2929 3300
2930use CFClient::OpenGL; 3301use CFPlus::OpenGL;
2931 3302
2932sub new { 3303sub new {
2933 my $class = shift; 3304 my $class = shift;
2934 3305
2935 my $self = $class->SUPER::new ( 3306 my $self = $class->SUPER::new (
2936 items => [], 3307 items => [],
2937 z => 100, 3308 z => 100,
2938 @_, 3309 @_,
2939 ); 3310 );
2940 3311
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3312 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3313
2943 for my $item (@{ $self->{items} }) { 3314 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3315 my ($widget, $cb, $tooltip) = @$item;
2945 3316
2946 # handle various types of items, only text for now 3317 # handle various types of items, only text for now
2947 if (!ref $widget) { 3318 if (!ref $widget) {
3319 if ($widget =~ /\t/) {
3320 my ($left, $right) = split /\t/, $widget, 2;
3321
2948 $widget = new CFClient::UI::Label 3322 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3323 can_hover => 1,
2950 can_events => 1, 3324 can_events => 1,
3325 tooltip => $tooltip,
3326 children => [
3327 (new CFPlus::UI::Label markup => $left, expand => 1),
3328 (new CFPlus::UI::Label markup => $right, align => +1),
3329 ],
3330 ;
3331
3332 } else {
3333 $widget = new CFPlus::UI::Label
3334 can_hover => 1,
3335 can_events => 1,
2951 markup => $widget, 3336 markup => $widget,
2952 tooltip => $tooltip 3337 tooltip => $tooltip;
3338 }
2953 } 3339 }
2954 3340
2955 $self->{item}{$widget} = $item; 3341 $self->{item}{$widget} = $item;
2956 3342
2957 $self->{vbox}->add ($widget); 3343 $self->{vbox}->add ($widget);
… …
2962 3348
2963# popup given the event (must be a mouse button down event currently) 3349# popup given the event (must be a mouse button down event currently)
2964sub popup { 3350sub popup {
2965 my ($self, $ev) = @_; 3351 my ($self, $ev) = @_;
2966 3352
2967 $self->_emit ("popdown"); 3353 $self->emit ("popdown");
2968 3354
2969 # maybe save $GRAB? must be careful about events... 3355 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3356 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3357 $self->{button} = $ev->{button};
2972 3358
2973 $self->show; 3359 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3360 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3361}
2976 3362
2977sub mouse_motion { 3363sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3364 my ($self, $ev, $x, $y) = @_;
2979 3365
2980 # TODO: should use vbox->find_widget or so 3366 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3367 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3368 $self->{hover} = $self->{item}{$HOVER};
2983 3369
2984 0 3370 0
2985} 3371}
2986 3372
2987sub button_up { 3373sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3374 my ($self, $ev, $x, $y) = @_;
2989 3375
2990 if ($ev->{button} == $self->{button}) { 3376 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3377 undef $GRAB;
2992 $self->hide; 3378 $self->hide;
2993 3379
2994 $self->_emit ("popdown"); 3380 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3381 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3382 } else {
2997 return 0 3383 return 0
2998 } 3384 }
2999 3385
3000 1 3386 1
3001} 3387}
3002 3388
3003############################################################################# 3389#############################################################################
3004 3390
3005package CFClient::UI::Multiplexer; 3391package CFPlus::UI::Multiplexer;
3006 3392
3007our @ISA = CFClient::UI::Container::; 3393our @ISA = CFPlus::UI::Container::;
3008 3394
3009sub new { 3395sub new {
3010 my $class = shift; 3396 my $class = shift;
3011 3397
3012 my $self = $class->SUPER::new ( 3398 my $self = $class->SUPER::new (
… …
3026 3412
3027 $self->{current} = $self->{children}[0] 3413 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3414 if @{ $self->{children} };
3029} 3415}
3030 3416
3417sub get_current_page {
3418 my ($self) = @_;
3419
3420 $self->{current}
3421}
3422
3031sub set_current_page { 3423sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3424 my ($self, $page_or_widget) = @_;
3033 3425
3034 my $widget = ref $page_or_widget 3426 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3427 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3428 : $self->{children}[$page_or_widget];
3037 3429
3038 $self->{current} = $widget; 3430 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3431 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3432
3041 $self->_emit (page_changed => $self->{current}); 3433 $self->emit (page_changed => $self->{current});
3042 3434
3043 $self->realloc; 3435 $self->realloc;
3044} 3436}
3045 3437
3046sub visible_children { 3438sub visible_children {
… …
3051 my ($self) = @_; 3443 my ($self) = @_;
3052 3444
3053 $self->{current}->size_request 3445 $self->{current}->size_request
3054} 3446}
3055 3447
3056sub size_allocate { 3448sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3449 my ($self, $w, $h) = @_;
3058 3450
3059 $self->{current}->configure (0, 0, $w, $h); 3451 $self->{current}->configure (0, 0, $w, $h);
3452
3453 1
3060} 3454}
3061 3455
3062sub _draw { 3456sub _draw {
3063 my ($self) = @_; 3457 my ($self) = @_;
3064 3458
3065 $self->{current}->draw; 3459 $self->{current}->draw;
3066} 3460}
3067 3461
3068############################################################################# 3462#############################################################################
3069 3463
3070package CFClient::UI::Notebook; 3464package CFPlus::UI::Notebook;
3071 3465
3072our @ISA = CFClient::UI::VBox::; 3466our @ISA = CFPlus::UI::VBox::;
3073 3467
3074sub new { 3468sub new {
3075 my $class = shift; 3469 my $class = shift;
3076 3470
3077 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3472 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3473 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3474 # filter => # will be put between multiplexer and $self
3081 @_, 3475 @_,
3082 ); 3476 );
3083 3477
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3478 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3090sub add { 3484sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3485 my ($self, $title, $widget, $tooltip) = @_;
3092 3486
3093 Scalar::Util::weaken $self; 3487 Scalar::Util::weaken $self;
3094 3488
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3489 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3490 markup => $title,
3097 tooltip => $tooltip, 3491 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3492 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3493 );
3100 3494
3101 $self->{multiplexer}->add ($widget); 3495 $self->{multiplexer}->add ($widget);
3102} 3496}
3103 3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{multiplexer}->get_current_page
3502}
3503
3104sub set_current_page { 3504sub set_current_page {
3105 my ($self, $page) = @_; 3505 my ($self, $page) = @_;
3106 3506
3107 $self->{multiplexer}->set_current_page ($page); 3507 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3508 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3509}
3110 3510
3111############################################################################# 3511#############################################################################
3112 3512
3113package CFClient::UI::Combobox; 3513package CFPlus::UI::Selector;
3114 3514
3115use utf8; 3515use utf8;
3116 3516
3117our @ISA = CFClient::UI::Button::; 3517our @ISA = CFPlus::UI::Button::;
3118 3518
3119sub new { 3519sub new {
3120 my $class = shift; 3520 my $class = shift;
3121 3521
3122 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3528 $self->_set_value ($self->{value});
3129 3529
3130 $self 3530 $self
3131} 3531}
3132 3532
3133sub button_down { 3533sub invoke_button_down {
3134 my ($self, $ev) = @_; 3534 my ($self, $ev) = @_;
3135 3535
3136 my @menu_items; 3536 my @menu_items;
3137 3537
3138 for (@{ $self->{options} }) { 3538 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3539 my ($value, $title, $tooltip) = @$_;
3140 3540
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3541 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3542 }
3143 3543
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3544 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3545}
3146 3546
3147sub _set_value { 3547sub _set_value {
3148 my ($self, $value) = @_; 3548 my ($self, $value) = @_;
3149 3549
… …
3159 my ($self, $value) = @_; 3559 my ($self, $value) = @_;
3160 3560
3161 return unless $self->{value} ne $value; 3561 return unless $self->{value} ne $value;
3162 3562
3163 $self->_set_value ($value); 3563 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3564 $self->emit (changed => $value);
3165} 3565}
3166 3566
3167############################################################################# 3567#############################################################################
3168 3568
3169package CFClient::UI::Statusbox; 3569package CFPlus::UI::Statusbox;
3170 3570
3171our @ISA = CFClient::UI::VBox::; 3571our @ISA = CFPlus::UI::VBox::;
3172 3572
3173sub new { 3573sub new {
3174 my $class = shift; 3574 my $class = shift;
3175 3575
3176 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
… …
3188sub reorder { 3588sub reorder {
3189 my ($self) = @_; 3589 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3590 my $NOW = Time::HiRes::time;
3191 3591
3192 # freeze display when hovering over any label 3592 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3593 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3594 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3595 values %{ $self->{item} };
3196 3596
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3597 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3598 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3599 }
… …
3220 for ($short) { 3620 for ($short) {
3221 s/^\s+//; 3621 s/^\s+//;
3222 s/\s+/ /g; 3622 s/\s+/ /g;
3223 } 3623 }
3224 3624
3225 new CFClient::UI::Label 3625 new CFPlus::UI::Label
3226 markup => $short, 3626 markup => $short,
3227 tooltip => $item->{tooltip}, 3627 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3628 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3629 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3630 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3684 count => 1,
3285 %arg, 3685 %arg,
3286 }; 3686 };
3287 } 3687 }
3288 3688
3689 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3690 $self->reorder;
3691 });
3290} 3692}
3291 3693
3292sub reconfigure { 3694sub reconfigure {
3293 my ($self) = @_; 3695 my ($self) = @_;
3294 3696
… …
3307 $self->SUPER::destroy; 3709 $self->SUPER::destroy;
3308} 3710}
3309 3711
3310############################################################################# 3712#############################################################################
3311 3713
3312package CFClient::UI::Inventory; 3714package CFPlus::UI::Inventory;
3313 3715
3314our @ISA = CFClient::UI::ScrolledWindow::; 3716our @ISA = CFPlus::UI::Table::;
3315 3717
3316sub new { 3718sub new {
3317 my $class = shift; 3719 my $class = shift;
3318 3720
3319 my $self = $class->SUPER::new ( 3721 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3722 col_expand => [0, 1, 0],
3723 items => [],
3321 @_, 3724 @_,
3322 ); 3725 );
3323 3726
3727 $self->set_sort_order (undef);
3728
3324 $self 3729 $self
3730}
3731
3732sub update_items {
3733 my ($self) = @_;
3734
3735 $self->clear;
3736
3737 my @item = $self->{sort}->(@{ $self->{items} });
3738
3739 my @adds;
3740 my $row = 0;
3741 for my $item ($self->{sort}->(@{ $self->{items} })) {
3742 CFPlus::Item::update_widgets $item;
3743
3744 push @adds, 0, $row, $item->{face_widget};
3745 push @adds, 1, $row, $item->{desc_widget};
3746 push @adds, 2, $row, $item->{weight_widget};
3747
3748 $row++;
3749 }
3750
3751 $self->add (@adds);
3752}
3753
3754sub set_sort_order {
3755 my ($self, $order) = @_;
3756
3757 $self->{sort} = $order ||= sub {
3758 sort {
3759 $a->{type} <=> $b->{type}
3760 or $a->{name} cmp $b->{name}
3761 } @_
3762 };
3763
3764 $self->update_items;
3325} 3765}
3326 3766
3327sub set_items { 3767sub set_items {
3328 my ($self, $items) = @_; 3768 my ($self, $items) = @_;
3329 3769
3330 $self->{child}->clear; 3770 $self->{items} = [$items ? values %$items : ()];
3331 return unless $items; 3771 $self->update_items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350} 3772}
3351 3773
3352############################################################################# 3774#############################################################################
3353 3775
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList; 3776package CFPlus::UI::SpellList;
3552 3777
3553our @ISA = CFClient::UI::Table::; 3778our @ISA = CFPlus::UI::Table::;
3554 3779
3555sub new { 3780sub new {
3556 my $class = shift; 3781 my $class = shift;
3557 3782
3558 my $self = $class->SUPER::new ( 3783 my $self = $class->SUPER::new (
… …
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3801 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577 3802
3578sub rebuild_spell_list { 3803sub rebuild_spell_list {
3579 my ($self) = @_; 3804 my ($self) = @_;
3580 3805
3581 $CFClient::UI::ROOT->on_refresh ($self => sub { 3806 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear; 3807 $self->clear;
3583 3808
3584 return unless $::CONN; 3809 return unless $::CONN;
3585 3810
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3811 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3812 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3813 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3814 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3815 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591 3816
3592 my $row = 0; 3817 my $row = 0;
3593 3818
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3819 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_}; 3820 my $spell = $self->{spell}{$_};
… …
3602 if ($ev->{button} == 1) { 3827 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}"); 3828 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) { 3829 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}"); 3830 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) { 3831 } elsif ($ev->{button} == 3) {
3832 my $shortname = CFPlus::shorten $spell->{name}, 14;
3607 (new CFClient::UI::Menu 3833 (new CFPlus::UI::Menu
3608 items => [ 3834 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3835 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3836 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ], 3837 ],
3612 )->popup ($ev); 3838 )->popup ($ev);
3613 } else { 3839 } else {
3614 return 0; 3840 return 0;
3615 } 3841 }
3616 3842
3617 1 3843 1
3618 }; 3844 };
3619 3845
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3846 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3621 3847
3622 #TODO: add path info to tooltip 3848 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3849 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3624 3850
3625 $self->add (0, $row, new CFClient::UI::Face 3851 $self->add (0, $row, new CFPlus::UI::Face
3626 face => $spell->{face}, 3852 face => $spell->{face},
3627 can_hover => 1, 3853 can_hover => 1,
3628 can_events => 1, 3854 can_events => 1,
3629 tooltip => $tooltip, 3855 tooltip => $tooltip,
3630 on_button_down => $spell_cb, 3856 on_button_down => $spell_cb,
3631 ); 3857 );
3632 3858
3633 $self->add (1, $row, new CFClient::UI::Label 3859 $self->add (1, $row, new CFPlus::UI::Label
3634 expand => 1, 3860 expand => 1,
3635 text => $spell->{name}, 3861 text => $spell->{name},
3636 can_hover => 1, 3862 can_hover => 1,
3637 can_events => 1, 3863 can_events => 1,
3638 tooltip => $tooltip, 3864 tooltip => $tooltip,
3639 on_button_down => $spell_cb, 3865 on_button_down => $spell_cb,
3640 ); 3866 );
3641 3867
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3868 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3869 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3870 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3871 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 } 3872 }
3647 }); 3873 });
3648} 3874}
3649 3875
3650sub add_spell { 3876sub add_spell {
… …
3668 $self->rebuild_spell_list; 3894 $self->rebuild_spell_list;
3669} 3895}
3670 3896
3671############################################################################# 3897#############################################################################
3672 3898
3673package CFClient::UI::Root; 3899package CFPlus::UI::Root;
3674 3900
3675our @ISA = CFClient::UI::Container::; 3901our @ISA = CFPlus::UI::Container::;
3676 3902
3677use List::Util qw(min max); 3903use List::Util qw(min max);
3678 3904
3679use CFClient::OpenGL; 3905use CFPlus::OpenGL;
3680 3906
3681sub new { 3907sub new {
3682 my $class = shift; 3908 my $class = shift;
3683 3909
3684 my $self = $class->SUPER::new ( 3910 my $self = $class->SUPER::new (
… …
3709 $coord = $max - $size if $coord > $max - $size; 3935 $coord = $max - $size if $coord > $max - $size;
3710 3936
3711 int $coord + 0.5 3937 int $coord + 0.5
3712} 3938}
3713 3939
3714sub size_allocate { 3940sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3941 my ($self, $w, $h) = @_;
3716 3942
3717 for my $child ($self->children) { 3943 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3944 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3945
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3949 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3950 $Y = _to_pixel $Y, $H, $self->{h};
3725 3951
3726 $child->configure ($X, $Y, $W, $H); 3952 $child->configure ($X, $Y, $W, $H);
3727 } 3953 }
3954
3955 1
3728} 3956}
3729 3957
3730sub coord2local { 3958sub coord2local {
3731 my ($self, $x, $y) = @_; 3959 my ($self, $x, $y) = @_;
3732 3960
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4086 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4087
3860 $w = 0 if $w < 0; 4088 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 4089 $h = 0 if $h < 0;
3862 4090
4091 $w = max $widget->{min_w}, $w;
4092 $h = max $widget->{min_h}, $h;
4093
4094# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4095# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4096
4097 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4098 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4099
3863 $w = int $w + 0.5; 4100 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 4101 $h = int $h + 0.5;
3865 4102
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4103 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 4104 $widget->{old_w} = $widget->{w};
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4127 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4128 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4129 glLoadIdentity;
3893 4130
3894 { 4131 {
3895 package CFClient::UI::Base; 4132 package CFPlus::UI::Base;
3896 4133
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4134 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4135 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4136
3901 $self->_draw; 4137 $self->_draw;
4138 }
3902} 4139}
3903 4140
3904############################################################################# 4141#############################################################################
3905 4142
3906package CFClient::UI; 4143package CFPlus::UI;
3907 4144
3908$ROOT = new CFClient::UI::Root; 4145$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4146$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4147
39111 41481
3912 4149

Diff Legend

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