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

Diff Legend

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